release 0.6.4
Merge branch '0.6'