make xhtml compliant
Merge pull request #266 from sashless/fix/make-xhtml-compliant

make xhtml compliant