Changes to support enclosing characters where length > 1
Support multiple char enclosing strings