Merge pull request #12 from jakiestfu/master

Upstream
Merge pull request #93 from morgante/master

Merge pull request #12 from jakiestfu/master