Updated for the 0.6.5 release.