Merge branch 'hotfix/1.0.1-1'
fix
update version
Merge branch 'hotfix/1.0.1-2' into develop