Merge tag 'v1.0' into develop

v1.0 Release
bugfix
Merge branch 'release/v1.0.1'