Uncommented key codes
Merge branch 'master'