made one-off options for Matt a run-time option instead of compile time
made one-off options for Matt a run-time option instead of compile time


angavrilov/olmar,angavrilov/olmar,angavrilov/olmar,angavrilov/olmar