Merge pull request #577 from bbirand/patch-1