Merge pull request #17 from jafingerhut/master

Fix a couple of bugs in key-comparator
Merge commit '@{1}' into develop