Merge pull request #67 from calebbradley/gh-pages

catchup merge