Version 2.0
Hand-written lexer for new grammar file format
Fixing grammar files
Fixing CLI parser