Fixed cmake
Merge branch 'master' into threaded_collisions