Merge #41: Correcting code, replace md5 to utils folder