Merge branch 'release/v1.0' into develop
Apply fixes
Bumping to version 1.0.1
Merge branch 'release/v1.0.1'