Fixed key events
Merge remote-tracking branch 'origin/master'