Merge pull request #8 from jakiestfu/master

Upstream
Merge pull request #88 from morgante/master

Merge pull request #8 from jakiestfu/master