updated for 1.3.1, added HTMLEscape back in, which allows for manually making sure <, >, & are html safe