Fixed CMakeLists.txt
Finish merge