Merge branch 'release/0.6.1'
Merge tag '0.6.1' into develop

Released 0.6.1