Merge pull request #1 from tristanCardot/master

merge => gh-pages
Merge pull request #2 from tristanCardot/gh-pages

Merge pull request #1 from tristanCardot/master