regex modified
Merge branch 'issue-refactor-regex'
0.2.4