Improved CMakeLists.txt
Improved error handling
Upped version for previous changes