bug fixes
mergy CMakeLists.txt