Merge pull request #20 from louispvb/cmake_changes

Cmake changes
Modular building and linux fixes
Merge remote-tracking branch 'upstream/master' into cmake_changes

merging