Using native JavaScript bcrypt implementation
Merge remote-tracking branch 'origin/master'