Merge pull request #15 from AdrienGiboire/master

Update Master branch
Merge branch 'master' into gh-pages