Fixed html escaping #16