Last push to merge

some minor changes on Lexer.py and its test code