Merge tag 'v1.0.1' into develop

hotfix v1.0.1
bugfix
Merge branch 'release/v1.0.2'