Merge pull request #15 from jfdm/fix/parsers

Fixed spelling of lexeme and fixed over lexing.