6.5.2
Added test for ampersands escaping
Fixed ampersands escaping