Updated the manual and cmakelists