Update CMake and README