Merge pull request #13 from jakiestfu/master

Upstream
Merge pull request #94 from morgante/master

Merge pull request #13 from jakiestfu/master