Merge pull request #6 from jakiestfu/master

Upstream
Merge pull request #85 from morgante/master

Merge pull request #6 from jakiestfu/master