Merge pull request #2 from puls/gh-pages

Get up-to-date
Merge pull request #46 from jonahgreenthal/gh-pages

Merge pull request #2 from puls/gh-pages