Merge pull request #10 from jakiestfu/master

Upstream
Merge pull request #91 from morgante/master

Merge pull request #10 from jakiestfu/master