Merge pull request #43 from calebbradley/gh-pages

update
Merge pull request #44 from calebbradley/master

Merge pull request #43 from calebbradley/gh-pages