Bumped versions
Merge branch 'release/different_options' into develop