Ported dodo's calculator to CBFeature, and added better calculator regex