Final version of CMakeLists and Makefile