better regexp (JBTIS-103) >> master