added more regex validation
Merge