Merge pull request #1 from FredericMeinnel/master

First pull request