update to v0.6
Merge branch 'dev'