replaced md5 with hashlib
merged
merged