Merge pull request #1 from bouil/gh-pages

Merge upstream.