Merge pull request #67 from calebbradley/gh-pages

catchup merge
Merge pull request #68 from calebbradley/master

Merge pull request #67 from calebbradley/gh-pages