Closes #614
Shortcut no work on Mac
Merge branch 'master' into gui_K