Merge branch 'release/1.0.1'
fixes
Merge branch 'hotfix/1.0.1-1' into develop