manual merge
Merge pull request #96 from morgante/master

Merge pull request #15 from jakiestfu/master
Merge pull request #16 from jakiestfu/master

Upstream