Fixed issue16, removed keybindings for keys we are mapping.
Merge branches 'master' and 'issue16'