Merge pull request #3 from Pickra/master

broken again
Merge pull request #4 from Pickra/gh-pages

Merge pull request #3 from Pickra/master