Merge branch 'release-0.0.5' into develop