Merge pull request #5 from sesamechicken/gh-pages

Pull into master
Merge pull request #6 from sesamechicken/master

Merge pull request #5 from sesamechicken/gh-pages