bump version correctly
Merge release 'v0.6.1' into develop