Add shortcuts for the menus. fixes #394

Manual merge of pull #654
Manual merge of pull 654