Fix cmake
Merge remote-tracking branch 'origin/hackathon' into Kofinas_Miltos