Merging
Fixed Makefile