Merge pull request #14 from jakiestfu/master

Upstream