Merge pull request #11 from jakiestfu/master

Upstream
Merge pull request #92 from morgante/master

Merge pull request #11 from jakiestfu/master