Revise mapping in command-mode
Merge branch 'master' into mac