#40 - Changed branch for lexer
#40 - back to dev-master
#40 - back to 1.0.x