Merge pull request #9 from sampaisley/master

Master
Merge pull request #10 from sampaisley/gh-pages

Merge pull request #9 from sampaisley/master