CMake configuration improved and cleaned up
Readme updated