Made the project cross-platform using CMake
Merged changes