Added enter-key support