Changed non-existent re.find to re.match
Fixed non-capturing parenthesis