CMakelist fix
Merge pull request #2 from jpmerc/patch-1

CMakelist fix
Merge branch 'develop' into exp_python