latest codes before git auto-merge (which turned out to be a disaster)
Merge branch 'master' of https://github.com/arnellebalane/automata