Merge pull request #12 from jakiestfu/master

Upstream