Adding support for = delimiter change by fixing Regex

I've added support for = style delimiter changing by switching to a non greedy Regex.