Merge branch 'release-0.6'
Merge tag '0.6' into develop

version number 0.6