Merge pull request #2 from rpav/key-return-fix