added optional html escaping of values
2.3.0