Project include fixes
CMake build script added
Merge