npe for password.toCharArray()
Merge remote-tracking branch 'origin/master'