Merge tag '0.6.1' into develop

Released 0.6.1
bumped version
Merge branch 'release/0.6.2'