Sha improvement
Merge branch 'master' into Sha1_openssl