Merge branch 'release/1.0.0' into develop
Convert indentation to spaces
Version number bump
Merge branch 'release/1.0.1'