Updated for 1.0.1 release.