Merge pull request #10 from jakiestfu/master

Upstream