Added Regex into helpers
Merge branch 'master' into controller