Update lexer to be more JFlex friendly
Merge pull request #10 from Arcnor/master

Update lexer to be more JFlex friendly