Merge branch 'release/1.0.0' into develop
Update tests
Merge branch 'develop'