manual merge
Merge remote-tracking branch 'origin/master'
Merge pull request #98 from morgante/master

Merge pull request #17 from jakiestfu/master
Merge pull request #18 from jakiestfu/master

Upstream