Added support for more special chars