Merge pull request #15 from jakiestfu/master

Upstream