Merge branch 'release/1.0.2' into develop
Cirtical bug fix
Updated history
Merge branch 'release/1.0.3'