Added support for escape and return keys.