Add support for escape char