Merge branches

Merge branches cmake and develop