Manual merge
Merge pull request #94 from morgante/master

Merge pull request #13 from jakiestfu/master
Merge pull request #14 from jakiestfu/master

Upstream