Improve <CR> mapping compatible. #43