Enhanced regex (#15)