update version
Merge branch 'release_1.0.2'
Merge branch 'master' into develop