Added missing .cpp file + improved Makefile