Merge branch 'release/0.0.6' into develop
Square bullets
merge develop