Manual merge
Merge remote-tracking branch 'origin/master'
Merge pull request #93 from morgante/master

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

Upstream