Merge pull request #3 from jakiestfu/master

Upstream