support for non-std::string keys
Merge pull request #2 from sanderbog/rebase_for_develop

support for non-std::string keys