improve lexer
version 0.1.626