Update Makefile a little bit and update the colormap class