Teapot support
Merge pull request #1 from devmop/patch-1

Teapot support