Merge branch 'release/v1.0.2' into develop
Optional properties &reset parameters
upped version & changelog
Merge branch 'release/1.0.3'