added key listener
Merge remote-tracking branch 'remotes/origin/rudie'