use regex in replace
Merge branch 'regex'