Added HTML support
Take Two