Merge pull request #191 from kberg/option-consolidation