Merge pull request #650 from yvaucher/patch-1