Merge pull request #4 from JackDougherty/master

pull from master
Merge pull request #5 from JackDougherty/gh-pages

Merge pull request #4 from JackDougherty/master