Added new changes

:dancer:
Merge pull request #7 from ThatCanadianGuy/Spencer-Branch

Added new changes