Patch bug and security vulnerability
Merge branch 'master' of github.com:ethanal/Nimbus