change regexes to address #30

not yet tested...