Merges 3 different regexes into one that handles all the cases
Merge branch 'master' of https://github.com/montero-melis/cha2db