Merge pull request #7 from ctesniere/master

Merge
Merge pull request #8 from ctesniere/gh-pages

Merge pull request #7 from ctesniere/master