Merge pull request #3 from tristanCardot/master

merge => gh-pages