Added regex validation.
Merge branch 'hotfix/regex'