add handling of return button (issue #5)