Proper version for release
Merge branch 'release/Release_1.0.2' into develop