Merge pull request #1 from knaman/master

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

Merge pull request #1 from knaman/master