Close #1 - Add xHTML option