attempt to fix CImg
Merge branch 'temporary-work'