diff --git a/doc/Changelog.html b/doc/Changelog.html
index 9e539cd9..08f35f39 100644
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -20,7 +20,7 @@ a:visited { color: #0000EE; }
 <li>Upgraded build environment to Microsoft Visual Studio 2010
 <li>Dropping support for Windows 2000 and for Windows XP RTM/SP1, Windows XP needs SP2 or SP3 now!
 <li>Added a new translation: Korean
-<li>Updated LAME encoder to v3.99.0.16 (2011-04-09), compiled with ICL 12.0.3 and MSVC 10.0
+<li>Updated LAME encoder to v3.99.1.0 (2011-04-15), compiled with ICL 12.0.3 and MSVC 10.0
 <li>Updated MediaInfo to v0.7.43 (2011-04-10), compiled with ICL 12.0.3 and MSVC 10.0
 <li>Updated language files (big thank-you to all contributors !!!)
 </ul><br>
diff --git a/res/tools/lame.exe b/res/tools/lame.exe
index 0db1738a..4c01b6a8 100644
Binary files a/res/tools/lame.exe and b/res/tools/lame.exe differ
diff --git a/src/Config.h b/src/Config.h
index 851a619c..27cb781b 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -29,8 +29,8 @@
 #define VER_LAMEXP_MINOR_HI					0
 #define VER_LAMEXP_MINOR_LO					2
 #define VER_LAMEXP_TYPE						Alpha
-#define VER_LAMEXP_PATCH					3
-#define VER_LAMEXP_BUILD					442
+#define VER_LAMEXP_PATCH					4
+#define VER_LAMEXP_BUILD					444
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tools versions
diff --git a/src/Dialog_About.cpp b/src/Dialog_About.cpp
index 583956e3..72d691ea 100644
--- a/src/Dialog_About.cpp
+++ b/src/Dialog_About.cpp
@@ -287,7 +287,7 @@ void AboutDialog::showMoreAbout(void)
 	moreAboutText += makeToolText
 	(
 		tr("LAME &minus; OpenSource mp3 Encoder"),
-		"lame.exe", "v?.??, Alpha-??",
+		"lame.exe", "v?.??, Beta-?",
 		tr("Released under the terms of the GNU Lesser General Public License."),
 		"http://lame.sourceforge.net/"
 	);
diff --git a/src/Global.cpp b/src/Global.cpp
index 32d8d3ec..0827d433 100644
--- a/src/Global.cpp
+++ b/src/Global.cpp
@@ -229,7 +229,17 @@ const char *lamexp_support_url(void) { return g_lamexp_support_url; }
  */
 bool lamexp_version_demo(void)
 {
-	return LAMEXP_DEBUG || !(strstr(g_lamexp_version.ver_release_name, "Final") || strstr(g_lamexp_version.ver_release_name, "Hotfix"));
+	char buffer[128];
+	bool releaseVersion = false;
+	if(!strcpy_s(buffer, 128, g_lamexp_version.ver_release_name))
+	{
+		char *context, *prefix = strtok_s(buffer, "-,; ", &context);
+		if(prefix)
+		{
+			releaseVersion = (!_stricmp(prefix, "Final")) || (!_stricmp(prefix, "Hotfix"));
+		}
+	}
+	return LAMEXP_DEBUG || (!releaseVersion);
 }
 
 /*
diff --git a/src/Main.cpp b/src/Main.cpp
index 939a78f4..b27e730d 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -183,46 +183,49 @@ int lamexp_main(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-#ifdef _DEBUG
-	int iResult = -1;
-	qInstallMsgHandler(lamexp_message_handler);
-	LAMEXP_MEMORY_CHECK(iResult = lamexp_main(argc, argv));
-	lamexp_finalization();
-	return iResult;
-#else
-	try
+	if(LAMEXP_DEBUG)
 	{
 		int iResult = -1;
 		qInstallMsgHandler(lamexp_message_handler);
-		iResult = lamexp_main(argc, argv);
+		LAMEXP_MEMORY_CHECK(iResult = lamexp_main(argc, argv));
 		lamexp_finalization();
 		return iResult;
 	}
-	catch(char *error)
+	else
 	{
-		fflush(stdout);
-		fflush(stderr);
-		fprintf(stderr, "\nGURU MEDITATION: %s\n", error);
-		FatalAppExit(0, L"Unhandeled exception error, application will exit!");
-		TerminateProcess(GetCurrentProcess(), -1);
+		try
+		{
+			int iResult = -1;
+			qInstallMsgHandler(lamexp_message_handler);
+			iResult = lamexp_main(argc, argv);
+			lamexp_finalization();
+			return iResult;
+		}
+		catch(char *error)
+		{
+			fflush(stdout);
+			fflush(stderr);
+			fprintf(stderr, "\nGURU MEDITATION: %s\n", error);
+			FatalAppExit(0, L"Unhandeled exception error, application will exit!");
+			TerminateProcess(GetCurrentProcess(), -1);
+		}
+		catch(int error)
+		{
+			fflush(stdout);
+			fflush(stderr);
+			fprintf(stderr, "\nGURU MEDITATION: Error code 0x%X\n", error);
+			FatalAppExit(0, L"Unhandeled exception error, application will exit!");
+			TerminateProcess(GetCurrentProcess(), -1);
+		}
+		catch(...)
+		{
+			fflush(stdout);
+			fflush(stderr);
+			fprintf(stderr, "\nGURU MEDITATION !!!\n");
+			FatalAppExit(0, L"Unhandeled exception error, application will exit!");
+			TerminateProcess(GetCurrentProcess(), -1);
+		}
 	}
-	catch(int error)
-	{
-		fflush(stdout);
-		fflush(stderr);
-		fprintf(stderr, "\nGURU MEDITATION: Error code 0x%X\n", error);
-		FatalAppExit(0, L"Unhandeled exception error, application will exit!");
-		TerminateProcess(GetCurrentProcess(), -1);
-	}
-	catch(...)
-	{
-		fflush(stdout);
-		fflush(stderr);
-		fprintf(stderr, "\nGURU MEDITATION !!!\n");
-		FatalAppExit(0, L"Unhandeled exception error, application will exit!");
-		TerminateProcess(GetCurrentProcess(), -1);
-	}
-#endif
 }
 
 extern "C"
diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp
index b7dca624..76f3f26c 100644
--- a/src/Thread_Initialization.cpp
+++ b/src/Thread_Initialization.cpp
@@ -58,7 +58,7 @@ g_lamexp_tools[] =
 	{"d33cd86f04bd4067e244d2804466583c7b90a4e2", CPU_TYPE_ALL, "flac.exe", 121},
 	{"9328a50e89b54ec065637496d9681a7e3eebf915", CPU_TYPE_ALL, "gpgv.exe", 1411},
 	{"d837bf6ee4dab557d8b02d46c75a24e58980fffa", CPU_TYPE_ALL, "gpgv.gpg", UINT_MAX},
-	{"b8800842893e2900eea7cda5c2556661333bc5db", CPU_TYPE_ALL, "lame.exe", 39916},
+	{"d5b3b80220d85a9fd2f486e37c1fb6511f3c2d72", CPU_TYPE_ALL, "lame.exe", 3990},
 	{"a4e929cfaa42fa2e61a3d0c6434c77a06d45aef3", CPU_TYPE_ALL, "mac.exe", 406},
 	{"9ee3074dc3232c61c0ffd6ae6755f65974695c51", CPU_TYPE_GEN, "mediainfo.i386.exe", 743},
 	{"3691da33a4efd7625d1bd01cbf5ce6ffd8a12d19", CPU_TYPE_X64, "mediainfo.x64.exe", 743},