reem Merge pull request #21 from Nemo157/option_modifier …