Merge pull request #16 from jakiestfu/master

Upstream
Merge pull request #97 from morgante/master

Merge pull request #16 from jakiestfu/master