Merge pull request #1 from tristanCardot/master

merge => gh-pages