Merge pull request #44 from Geogi/dev

Automaton engine: merged.
Merge remote-tracking branch 'origin/master'
Verbose engine should be fine

But there's a bug somewhere