refacor regex
Merge branch refactor-regex