Merge pull request #2 from ThatCanadianGuy/master

test