Fix #8 (hashmap support)