Cmake merged master

Cmake merged master