Merge pull request #37 from int-index/lexer-bugfix

Fix a bug in the Lexer
Merge branch 'master' from upstream