added keydown event handler
merge with develop