Merge pull request #92 from Melix19/fix_shortcuts

Improved keyboard shortcut system