Fixed possible XSS in escape functions
0.6.4: updated tests for new escape function