Prevent creating to many wrappers for the hashmap by preconverting the hashmap
Merge pull request #151 from wajam/olivier-impv

Won't fix the build but nice catch, so I want to commit anyway