Updated makefile
Added the expression parser