Merge pull request #1 from remy/master

Merge