Merge pull request #58 from calebbradley/gh-pages

Merging pull requests #53 - #57