Merge pull request #5 from ThatCanadianGuy/master

Update to master
Merge pull request #6 from ThatCanadianGuy/Spencer-Branch

Merge pull request #5 from ThatCanadianGuy/master