Updated in preparation for 0.4 release.