Merge branch 'release-0.0.6'