Rework hash helpers
Merge pull request #96 from intercom/BL/rework-hash-helper

Rework hash helpers