Merge pull request #1 from andalau/master

Master
Merge pull request #2 from andalau/gh-pages

Merge pull request #1 from andalau/master