Merge branch 'release/0.10.1' into develop
Fixed timeout short option key
Version bump
Merge branch 'release/0.10.2'