v0.6.4 released
Merge branch 'release/0.6.4' into develop
Next version is 0.7.0