Update to use HashMap::entry API
Merge pull request #11 from hjr3/hashmap_entry-fix

Update to use HashMap::entry API