Merge pull request #5 from jakiestfu/master

Upstream
Merge pull request #84 from morgante/master

Merge pull request #5 from jakiestfu/master