improved hashmap implementation
Merge branch 'merge64' into merge65