Merge pull request #1 from mickaelandrieu/master

initial commit