Added option for surrounding delimiters