changed to allow macros in the string to be parsed.