Updated for 0.6.1 release.