Updated for teapot 1.0.0 release.