Merge pull request #1 from denovogear/master

Merge Upstream
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:denovogear/denovogear