Merge pull request #1 from FredericMeinnel/master

First pull request
Merge pull request #1 from leonardbj/master

Merge pull request #1 from FredericMeinnel/master