bugfix: non-working key-commands, wrong button mapping
Merge remote-tracking branch 'origin/master'