*** cmake cleaned
Merge branch 'origin/master'
fixed cmake issues