Merge pull request #30 from samwilliams312/master

background
Merge pull request #31 from samwilliams312/gh-pages

Merge pull request #30 from samwilliams312/master