Merge the latest changes: CMakeLists.txt updated to correct the typos.