Preparing for teapot 0.9.7