updates cmake branch with latest changes