fine tune regexes closes #105