Merge pull request #1 from TheSmitchell/master

Merge from master
Merge pull request #2 from TheSmitchell/gh-pages

Merge pull request #1 from TheSmitchell/master