KeyListener methods added
Merge remote-tracking branch 'slipson/master'