Merge branch 'release/0.0.6'
Merge branch 'master' into develop