Prepare v0.6.4

[fixes #265][fixes #261]