Add keymap shortcuts - resolve #159