Merge pull request #531 from BenMorel/patch-1