updated regular expression
updated