Merge branch 'release/v0.6.1'
Merge tag 'v0.6.1' into develop

0.6.1