Updated keylistener
Merge