Merge pull request #8 from jakiestfu/master

Upstream