Merge branch 'release-0.0.5'
Merge branch 'master' into develop