support for gridded/raster data; see issue #45
fixed a merge issue