Merge pull request #7 from jakiestfu/master

Upstream
Merge pull request #87 from morgante/master

Merge pull request #7 from jakiestfu/master