edited main.cpp and Makefile