Merge pull request #11 from jakiestfu/master

Upstream