Fixed 171: Updated CMakefile to latest changes