fix for additional options
Merge branch 'options-feature'