Merge branch 'lexer'