master
Finishing work on lexer