Added support of html markup