Merge pull request #1 from mickaelandrieu/master

initial commit
Merge pull request #2 from mickaelandrieu/1.0

Merge pull request #1 from mickaelandrieu/master