diff --git a/pyqtgraph/graphicsItems/ImageItem.py b/pyqtgraph/graphicsItems/ImageItem.py
index 4dd895f2..0bdf61ac 100644
--- a/pyqtgraph/graphicsItems/ImageItem.py
+++ b/pyqtgraph/graphicsItems/ImageItem.py
@@ -153,7 +153,10 @@ class ImageItem(GraphicsObject):
 
     def setOpts(self, update=True, **kargs):
         if 'axisOrder' in kargs:
-            self.axisOrder = kargs['axisOrder']
+            val = kargs['axisOrder']
+            if val not in ('row-major', 'col-major'):
+                raise ValueError('axisOrder must be either "row-major" or "col-major"')
+            self.axisOrder = val
         if 'lut' in kargs:
             self.setLookupTable(kargs['lut'], update=update)
         if 'levels' in kargs:
@@ -463,6 +466,7 @@ class ImageItem(GraphicsObject):
                 bins = 500
 
         kwds['bins'] = bins
+        stepData = stepData[np.isfinite(stepData)]
         hist = np.histogram(stepData, **kwds)
         
         return hist[1][:-1], hist[0]
diff --git a/pyqtgraph/imageview/ImageView.py b/pyqtgraph/imageview/ImageView.py
index 68f1b54b..02f8d5e3 100644
--- a/pyqtgraph/imageview/ImageView.py
+++ b/pyqtgraph/imageview/ImageView.py
@@ -253,30 +253,22 @@ class ImageView(QtGui.QWidget):
         self.image = img
         self.imageDisp = None
         
-        if xvals is not None:
-            self.tVals = xvals
-        elif hasattr(img, 'xvals'):
-            try:
-                self.tVals = img.xvals(0)
-            except:
-                self.tVals = np.arange(img.shape[0])
-        else:
-            self.tVals = np.arange(img.shape[0])
-        
         profiler()
         
         if axes is None:
-            xy = (0, 1) if getConfigOption('imageAxisOrder') == 'legacy' else (1, 0)
+            x,y = (0, 1) if self.imageItem.axisOrder == 'col-major' else (1, 0)
             
             if img.ndim == 2:
-                self.axes = {'t': None, 'x': xy[0], 'y': xy[1], 'c': None}
+                self.axes = {'t': None, 'x': x, 'y': y, 'c': None}
             elif img.ndim == 3:
+                # Ambiguous case; make a guess
                 if img.shape[2] <= 4:
-                    self.axes = {'t': None, 'x': xy[0], 'y': xy[1], 'c': 2}
+                    self.axes = {'t': None, 'x': x, 'y': y, 'c': 2}
                 else:
-                    self.axes = {'t': 0, 'x': xy[0]+1, 'y': xy[1]+1, 'c': None}
+                    self.axes = {'t': 0, 'x': x+1, 'y': y+1, 'c': None}
             elif img.ndim == 4:
-                self.axes = {'t': 0, 'x': xy[0]+1, 'y': xy[1]+1, 'c': 3}
+                # Even more ambiguous; just assume the default
+                self.axes = {'t': 0, 'x': x+1, 'y': y+1, 'c': 3}
             else:
                 raise Exception("Can not interpret image with dimensions %s" % (str(img.shape)))
         elif isinstance(axes, dict):
@@ -290,6 +282,18 @@ class ImageView(QtGui.QWidget):
             
         for x in ['t', 'x', 'y', 'c']:
             self.axes[x] = self.axes.get(x, None)
+        axes = self.axes
+
+        if xvals is not None:
+            self.tVals = xvals
+        elif axes['t'] is not None:
+            if hasattr(img, 'xvals'):
+                try:
+                    self.tVals = img.xvals(axes['t'])
+                except:
+                    self.tVals = np.arange(img.shape[axes['t']])
+            else:
+                self.tVals = np.arange(img.shape[axes['t']])
 
         profiler()
 
@@ -470,7 +474,7 @@ class ImageView(QtGui.QWidget):
         
     def setCurrentIndex(self, ind):
         """Set the currently displayed frame index."""
-        self.currentIndex = np.clip(ind, 0, self.getProcessedImage().shape[0]-1)
+        self.currentIndex = np.clip(ind, 0, self.getProcessedImage().shape[self.axes['t']]-1)
         self.updateImage()
         self.ignoreTimeLine = True
         self.timeLine.setValue(self.tVals[self.currentIndex])
@@ -654,11 +658,21 @@ class ImageView(QtGui.QWidget):
         
         if autoHistogramRange:
             self.ui.histogram.setHistogramRange(self.levelMin, self.levelMax)
-        if self.axes['t'] is None:
-            self.imageItem.updateImage(image)
+        
+        # Transpose image into order expected by ImageItem
+        if self.imageItem.axisOrder == 'col-major':
+            axorder = ['t', 'x', 'y', 'c']
         else:
+            axorder = ['t', 'y', 'x', 'c']
+        axorder = [self.axes[ax] for ax in axorder if self.axes[ax] is not None]
+        image = image.transpose(axorder)
+            
+        # Select time index
+        if self.axes['t'] is not None:
             self.ui.roiPlot.show()
-            self.imageItem.updateImage(image[self.currentIndex])
+            image = image[self.currentIndex]
+            
+        self.imageItem.updateImage(image)
             
             
     def timeIndex(self, slider):
diff --git a/pyqtgraph/imageview/tests/test_imageview.py b/pyqtgraph/imageview/tests/test_imageview.py
index 2ca1712c..3057a8a5 100644
--- a/pyqtgraph/imageview/tests/test_imageview.py
+++ b/pyqtgraph/imageview/tests/test_imageview.py
@@ -7,5 +7,6 @@ def test_nan_image():
     img = np.ones((10,10))
     img[0,0] = np.nan
     v = pg.image(img)
+    v.imageItem.getHistogram()
     app.processEvents()
     v.window().close()
diff --git a/pyqtgraph/tests/image_testing.py b/pyqtgraph/tests/image_testing.py
index 8660bc73..135ef59b 100644
--- a/pyqtgraph/tests/image_testing.py
+++ b/pyqtgraph/tests/image_testing.py
@@ -67,6 +67,30 @@ from .. import ImageItem, TextItem
 
 tester = None
 
+# Convenient stamp used for ensuring image orientation is correct
+axisImg = [
+"            1         1 1        ",
+"          1 1         1 1 1 1    ",
+"            1   1 1 1 1 1 1 1 1 1",
+"            1         1 1 1 1    ",
+"    1     1 1 1       1 1        ",
+"  1   1                          ",
+"  1   1                          ",
+"    1                            ",
+"                                 ",
+"    1                            ",
+"    1                            ",
+"    1                            ",
+"1 1 1 1 1                        ",
+"1 1 1 1 1                        ",
+"  1 1 1                          ",
+"  1 1 1                          ",
+"    1                            ",
+"    1                            ",
+]
+axisImg = np.array([map(int, row[::2].replace(' ', '0')) for row in axisImg])
+
+
 
 def getTester():
     global tester