fixed handling of issues by reducing the regexes into one
0.1.1