Merge pull request #10 from calebbradley/master

Merge pull request #9 from calebbradley/gh-pages
Merge pull request #11 from calebbradley/gh-pages

Merge pull request #10 from calebbradley/master