ensure we use restrictive, not greedy regex for matching
Merge pull request #1001 from faizkhan00/critfix

ensure we use restrictive, not greedy regex for matching