Merge branch 'release/v0.6.1' (early part)
update version number in readme to 0.6.1
Merge branch 'master' into develop