diff --git a/Form1.cs b/Form1.cs
index f164fee..de404c2 100644
--- a/Form1.cs
+++ b/Form1.cs
@@ -113,12 +113,7 @@ namespace photo_sorter
             else
             {
                 fname = global.filenames[global.position];
-                /*Image img;
-                using (var bmp = new Bitmap(fname))
-                {
-                    img = new Bitmap(bmp);
-                }*/
-                //var profile = fname.GetProfile("dng:thumbnail");
+                /* v0.1.1 Preview
                 using (var jpegThumbnail = new MagickImage(fname))
                 {
                     // Correct the image orientation
@@ -126,13 +121,28 @@ namespace photo_sorter
                     //Image img = jpegThumbnail.Write();
                     jpegThumbnail.Write(global.dest + "\\.tmp.jpg");
                 }
+                */
                 Image img;
-                using (var bmp = new Bitmap(global.dest + "\\.tmp.jpg"))
+                using (MemoryStream img_stream = new MemoryStream())
                 {
-                    img = new Bitmap(bmp);
+                    // Convert RAW file to JPEG in memory
+                    using (var raw_img = new MagickImage(fname))
+                    {
+                        if (raw_img != null)
+                        {
+                            raw_img.AutoOrient();
+                            img_stream.Position = 0;
+                            raw_img.Write(img_stream, ImageMagick.MagickFormat.Jpeg);
+                        }
+                    }
+
+                    img_stream.Position = 0;
+                    using (var bmp = new Bitmap(img_stream))
+                    {
+                        img = new Bitmap(bmp);
+                    }
                 }
                 img_preview.Image = img;
-                //img_preview.Image = jpegThumbnail;
                 img_preview.Visible = true;
                 GC.Collect();
                 GC.WaitForPendingFinalizers();
diff --git a/bin/Debug/photo_sorter.exe b/bin/Debug/photo_sorter.exe
index bfd0a50..12bda4a 100644
Binary files a/bin/Debug/photo_sorter.exe and b/bin/Debug/photo_sorter.exe differ
diff --git a/bin/Debug/photo_sorter.pdb b/bin/Debug/photo_sorter.pdb
index 1b2b873..3aead43 100644
Binary files a/bin/Debug/photo_sorter.pdb and b/bin/Debug/photo_sorter.pdb differ
diff --git a/obj/Debug/photo_sorter.csprojAssemblyReference.cache b/obj/Debug/photo_sorter.csprojAssemblyReference.cache
index ced7966..f6921b4 100644
Binary files a/obj/Debug/photo_sorter.csprojAssemblyReference.cache and b/obj/Debug/photo_sorter.csprojAssemblyReference.cache differ
diff --git a/obj/Debug/photo_sorter.exe b/obj/Debug/photo_sorter.exe
index bfd0a50..12bda4a 100644
Binary files a/obj/Debug/photo_sorter.exe and b/obj/Debug/photo_sorter.exe differ
diff --git a/obj/Debug/photo_sorter.pdb b/obj/Debug/photo_sorter.pdb
index 1b2b873..3aead43 100644
Binary files a/obj/Debug/photo_sorter.pdb and b/obj/Debug/photo_sorter.pdb differ