Merge pull request #404 from camilleroux/patch-1