Merge pull request #31 from narrowspark/develop

Develop
Merge pull request #4 from narrowspark/master

upgrade
fix
Fixed the encrypter