merge strong_password branch