Fixed encoding
Added support for XHTML -> HTML5 aware conversion