Updated CMakeLists and build instructions