Merge remote-tracking branches 'upstream/develop' and 'origin/develop' into develop
ColorMap class improved
ColorMap Class improved
Merge pull request #294 from salil93/color_map

Color Map Class improved