Merge pull request #7 from jakiestfu/master

Upstream