--- a/qrurls/views.py	Thu Aug 15 01:02:31 2013 +0300
+++ b/qrurls/views.py	Thu Aug 15 01:16:10 2013 +0300
@@ -34,7 +34,7 @@
     if not url_item :
         raise Http404()
 
-    # redirect
+    # redirect, either directly, or to image()
     url = url_item.get_absolute_url()
 
     return HttpResponseRedirect(url)
@@ -45,10 +45,13 @@
         url_item = URLItem.objects.get(shorturl=url_feed, id=int(item_id))
     except URLItem.DoesNotExist :
         raise Http404()
-        
-    if not url_item.image :
+    
+    if url_item.image :
+        return render(request, 'qrurls/image.html', dict(
+            title   = url_item.image.title,
+            image   = url_item.image,
+        ))
+    elif url_item.url :
+        return HttpResponseRedirect(url_item.url)
+    else :
         raise Http404()
-
-    return render(request, 'qrurls/image.html', dict(
-        image   = url_item.image,
-    ))