fix merge issue that completely broke optionsets
Merge pull request #261 from pezipink/master

fix merge issue that completely broke optionsets