fix option handling
Merge branch 'object'
refactor
Merge branch 'object'