changed colormap and no block
Merge remote-tracking branch 'origin/master'