Fixed makefile
Makefile
merge