Adding CMake and enhanced demo