Update to v0.6.2
Merge branch 'dev'