Added cmake build and coriolis compatibility
Merge branch 'Optimized_part' into CMake