added encoding to generateHash
Merge branch 'master' of github.com:framp/hash-password-default