Merge pull request #11 from kshirley/master

Master
Merge pull request #12 from kshirley/gh-pages

Merge pull request #11 from kshirley/master