Merge pull request #3 from sergeyklay/master

keymap_switch fixes