Feature/xhtml conditional

Close #49