Merge pull request #1 from TheSmitchell/master

Merge from master