updated master to v0.6.4.1