Merge branch 'hotfix/1.0.1'
Correct the version number
Merge branch 'hotfix/1.0.2' into develop