Merge pull request #323 from ifad/chore/use-strings-as-keys

Merge pull request #323 from ifad/chore/use-strings-as-keys #249