Fixed cmake directory for includes
Merge branch 'develop' into feature/Linked