Merge branch 'release/1.0.1'
Fix 1.0.1
Merge branch 'hotfix/1.0.1.1' into develop