v. 0.3.6, optimisations, better hash key handling