Modified CMakeLists.txt to hopefully fix issue #8