Merge branch 'hotfix/v1.0.1' into Master