Preparing for v0.6.4