Merge pull request #4 from jakiestfu/master

Upstream
Merge pull request #81 from morgante/master

Merge pull request #4 from jakiestfu/master