(MD5) fix some errors
Merge remote-tracking branch 'remotes/origin/master'