update options to prevent collision
bump version
Merge branch 'release/0.9.2' into develop