Merge branch 'develop'
Merge branch 'develop'
update hash_table
Merge branch 'master' into develop
using new hash_table