Merge branch 'master' into develop
seperate hash_code into different file
Merge branch 'develop'