v0.6.5
Merge branch 'dev'