Ready for new release
Merge branch 'release/v.0.6' into develop