diff --git a/VERSION b/VERSION
index aa82682f..35a08897 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.3 (2011-12-08 09:58:39) dev
+Version 1.99.3 (2011-12-08 11:01:39) dev
diff --git a/gluon/contrib/markmin/markmin2html.py b/gluon/contrib/markmin/markmin2html.py
index 2c3f7c8d..1cc99483 100755
--- a/gluon/contrib/markmin/markmin2html.py
+++ b/gluon/contrib/markmin/markmin2html.py
@@ -269,6 +269,7 @@ regex_link_popup = re.compile('\[\[(?P<t>[^\]]*?) +(?P<k>\S+) popup\]\]')
 regex_link_no_anchor = re.compile('\[\[ +(?P<k>\S+)\]\]')
 regex_qr = re.compile('(?<!["\w\>/=])qr:(?P<k>\w+://[\w\.\-\+\?&%\/]+)',re.M)
 regex_embed = re.compile('(?<!["\w\>/=])embed:(?P<k>\w+://[\w\.\-\+\?&%\/]+)',re.M)
+regex_auto_image = re.compile('(?<!["\w\>/=])(?P<k>\w+://[\w\.\-\+\?&%\/]+\.(jpeg|jpg|gif|png))',re.M)
 regex_auto_video = re.compile('(?<!["\w\>/=])(?P<k>\w+://[\w\.\-\+\?&%\/]+\.(mp4|mpeg|mov))',re.M)
 regex_auto_audio = re.compile('(?<!["\w\>/=])(?P<k>\w+://[\w\.\-\+\?&%\/]+\.(mp3|wav))',re.M)
 regex_auto = re.compile('(?<!["\w\>/=])(?P<k>\w+://[\w\.\-\+\?&%\/]+)',re.M)
@@ -400,6 +401,7 @@ def render(text,extra={},allowed={},sep='p'):
     text = regex_embed.sub('<iframe src="\g<k>" frameborder="0" allowfullscreen></iframe>', 
                            text)
     text = regex_qr.sub('<a href="\g<k>"><img width="80px" src="http://qrcode.kaywa.com/img.php?s=8&amp;d=\g<k>" /></a>', text)
+    text = regex_auto_image.sub('<img src="\g<k>" controls />', text)
     text = regex_auto_video.sub('<video src="\g<k>" controls></video>', text)
     text = regex_auto_audio.sub('<audio src="\g<k>" controls></audio>', text)
     text = regex_auto.sub('<a href="\g<k>">\g<k></a>', text)