Merge pull request #1284 from oneru/key-gen