Fix GetKeyList and add test
Merge pull request #11 from ncw/fix-get-key-list

Fix GetKeyList and add test