Improved lexer and updated .gitcommit
Improved lexer and updated .gitcommit
Resolved conflict
Another correction.