Add extra functionality to the build system
Fix comments in src/CMakeLists.txt
Merge branch 'build_fix'