Update to v0.6.1
Merge branch 'dev'