Improvements for generic.js.
Merge branch 'master' of https://github.com/hirvolt1/key-change