diff --git a/wxPython/demo/wxImageFromStream.py b/wxPython/demo/wxImageFromStream.py
new file mode 100644
index 0000000000..19e6f28f21
--- /dev/null
+++ b/wxPython/demo/wxImageFromStream.py
@@ -0,0 +1,38 @@
+
+from wxPython.wx import *
+from Main import opj
+
+from cStringIO import StringIO
+
+#----------------------------------------------------------------------
+
+class TestPanel(wxPanel):
+    def __init__(self, parent, log):
+        wxPanel.__init__(self, parent, -1)
+
+        data = open(opj('bitmaps/image.gif'), "rb").read()
+        stream = StringIO(data)
+
+        bmp = wxBitmapFromImage( wxImageFromStream( stream ))
+
+        wxStaticText(self, -1,
+                     "This image was loaded from a Python file-like object:",
+                     (15, 15))
+        wxStaticBitmap(self, -1, bmp, (15, 45))
+
+
+
+
+#----------------------------------------------------------------------
+
+def runTest(frame, nb, log):
+    win = TestPanel(nb, log)
+    return win
+
+#----------------------------------------------------------------------
+
+
+overview = """\
+At long last there is finally a way to load any supported image type
+directly from any Python file-like object, such as a memory buffer
+using StringIO.  """