diff --git a/src/hdd_vs_ufd.h b/src/hdd_vs_ufd.h
index 9d1b091f..1e96be1d 100644
--- a/src/hdd_vs_ufd.h
+++ b/src/hdd_vs_ufd.h
@@ -73,7 +73,7 @@ static str_score_t str_score[] = {
 	{ "MAXTOR", 10 },
 	{ "HITACHI", 10 },
 	{ "SEAGATE", 10 },
-	{ "SAMSUNG", 10 },
+	{ "SAMSUNG", 5 },
 	{ "FUJITSU", 10 },
 	{ "TOSHIBA", 5 },
 	{ "QUANTUM", 10 },
@@ -91,6 +91,7 @@ static str_score_t str_score[] = {
 
 static str_score_t str_adjust[] = {
 	{ "Gadget", -10 },
+	{ "Flash", -10 }
 };
 
 /* The lists belows set a score according to VID & VID:PID
@@ -127,7 +128,7 @@ static vid_score_t vid_score[] = {
 	{ 0x0718, -2 },		// Imation
 	{ 0x0781, -5 },		// SanDisk
 	{ 0x07ab, 8 },		// Freecom
-	{ 0x090c, -5 },		// Silicon Motion
+	{ 0x090c, -5 },		// Silicon Motion (also used by Samsung)
 	{ 0x0928, 10 },		// PLX Technology
 	{ 0x0930, -8 },		// Toshiba
 	{ 0x093a, -5 },		// Pixart
@@ -258,6 +259,8 @@ static vidpid_score_t vidpid_score[] = {
 	{ 0x067b, 0x3500, -10 },	// Hi-Speed Flash Disk with TruePrint AES3500
 	// Freecom exceptions
 	{ 0x07ab, 0xfcab, -20 },	// 4 GB UFD
+	// Samsung exceptions
+	{ 0x090c, 0x1000, -20 },	// Samsung Flash drive
 	// Toshiba exceptions
 	{ 0x0930, 0x1400, -20 },
 	{ 0x0930, 0x6533, -20 },
diff --git a/src/rufus.rc b/src/rufus.rc
index 07309d4e..c5ca9d81 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Rufus 2.4.729"
+CAPTION "Rufus 2.4.730"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -317,8 +317,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,729,0
- PRODUCTVERSION 2,4,729,0
+ FILEVERSION 2,4,730,0
+ PRODUCTVERSION 2,4,730,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -335,13 +335,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.4.729"
+            VALUE "FileVersion", "2.4.730"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.4.729"
+            VALUE "ProductVersion", "2.4.730"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/usb.c b/src/usb.c
index c31789db..fcd75374 100644
--- a/src/usb.c
+++ b/src/usb.c
@@ -137,9 +137,9 @@ static __inline BOOL IsVHD(const char* buffer)
 /* For debugging user reports of HDDs vs UFDs */
 //#define FORCED_DEVICE
 #ifdef FORCED_DEVICE
-#define FORCED_VID 0x174C
-#define FORCED_PID 0x3074
-#define FORCED_NAME "SanDisk Extreme USB Device"
+#define FORCED_VID 0x090c
+#define FORCED_PID 0x1000
+#define FORCED_NAME "Samsung Flash Drive USB Device"
 #endif
 
 /*