ID lexer control class
Add strip lex helper method
Merge branch 'master' into source-map