better regexp (JBTIS-103)
Merge pull request #53 from nickboldt/JBTIS-103_2

better regexp (JBTIS-103) >> master