Merge pull request #1 from cvrebert/patch-1