Merge branch 'hash_module'