Modified makefile and add compiler optimization