wch Merge pull request #61 from wch/fix-keyname