Add bcrypt support
Merge changes from master