Merge pull request #1858 from Azaezel/options_ON