fixed bug key in timotey.js
minor improvement to key_listener module
fixed merge