Update on CMake for Linux
Merge branch 'release/0.0.2.1'