Merge branch 'develop'
mapImage() can handle colormaps
Merge branch 'master' into develop