v0.6.0 released
Merge branch 'release/0.6.0' into develop
Next version is 0.6.1