OptionsMenu ENHANCED!
Merge branch 'dev-optionsMenu' into develop