Merge pull request #5 from jakiestfu/master

Upstream