Added new lex file, and changed Makefile