new stategie for regex
fixed test_regex
Merge branch 'regex' into future