Added keyboard events
merged