Updated version
Merge branch 'develop' into release/1.0.2
Merge branch 'release/1.0.2' into develop