Merge branch 'release/0.6.1' into develop
Add an export
Merge branch 'develop'