Merge pull request #434 from laanwj/addkey_retval