Improve CMAKE script
Merge branch 'develop'