Fixed formatting
Added support for raw tag