Fixed hashmap init
Merge branch 'master' into sangraama-static-server-clone