* Fixed: CMakeLists.txt sets mapper now correctly.