added support for 3d/colormap plotting of data in matrix form
merged changes