Merge pull request #1 from xloxlo/master

gh-pages
Merge pull request #2 from xloxlo/gh-pages

Merge pull request #1 from xloxlo/master