Added -X command line option
Updated xhtml output