Cmakelist changes
fixing :)
Merge remote-tracking branch 'origin/master' into stabilize