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