- Removed uneeded expansion in CMakeLists.txt
- Merged felipensp's changes