Optimize code; use greedy regex (Issue #497)