bcrypt incorporated
merged changes