Merge pull request #9 from jakiestfu/master

Upstream