Merge pull request #27 from cgaebel/master

Added key+value equivalents for the map getters.
s/kv/entry/