Fixing the keyboard shortcuts, fixes #125
Merge pull request #127 from mvexel/develop

Fixing the keyboard shortcuts, fixes #125