Improved build_dfa to avoid recursivity. A bit slower but more robust.
Merge branches.