Merge branch 'release/0.6.0' into develop
Update for 0.6.0
Merge branch 'develop'