FIX BCrypt
Merge origin/master