Merge pull request #12 from matthewwolfe/gh-pages

merge gh-pages back to master
Merge pull request #13 from matthewwolfe/master

Merge pull request #12 from matthewwolfe/gh-pages