Merge pull request #17 from jakiestfu/master

Upstream