Finish the regular expressions
Merge branch 'develop' of github.com:alcengapa/TDAF into develop