actually respond to options
Merge branch 'fix/options'