update for v0.6.1
Merge branch 'develop' for v0.6.1 release