Merge pull request #9 from kshirley/master

Merge pull request #8 from kshirley/gh-pages
Merge pull request #10 from kshirley/gh-pages

Merge pull request #9 from kshirley/master