adapted main.cpp and Makefile to grant testing comparability between different branches