added key event handler
Merge remote-tracking branch 'origin/master'
handling controls
Merge remote-tracking branch 'origin/master'
merged max's changes