Add spell to toggle-option-menu
Merge branch 'master' into mac