Only map <CR> when needed.
Merge pull request #319 from kirneh1986/master

Only map <CR> when needed