Merge pull request #17 from jakiestfu/master

Upstream
Merge pull request #98 from morgante/master

Merge pull request #17 from jakiestfu/master