Merge pull request #13 from jakiestfu/master

Upstream