Merge branch 'release/0.6.0' into develop
Fix tests
Fix docs
Fix tests.
Update version
Merge branch 'release/0.6.1'