Merge branch 'release-1.0'
Hotfix 1.0.1
Merge branch 'hotfix-1.0.1' into develop