Merge pull request #9 from jakiestfu/master

Upstream
Merge pull request #90 from morgante/master

Merge pull request #9 from jakiestfu/master