Merge branch 'release/1.0.1' into develop
fix popup
bump version
Merge branch 'release/1.0.2'