bug fix
Merge branch 'hotfix/1.0.1' into develop