Merge pull request #6 from ThatCanadianGuy/Spencer-Branch

Merge pull request #5 from ThatCanadianGuy/master
Merge pull request #7 from ThatCanadianGuy/Spencer-Branch

Added new changes
Merge pull request #9 from ThatCanadianGuy/master

updating back from master