Updated to support teapot 1.0