Merge pull request #5 from ThatCanadianGuy/master

Update to master