Merge branch 'hotfix-1.0.1'
fix hotfix
Merge branch 'hotfix-1.0.0' into develop