added support for xhtml