Merge pull request #376 from kugel-/keybindings-rework3