testing
added cmake finds
Merge branch 'master' into newApproach