diff --git a/HISTORY.txt b/HISTORY.txt
index 3755f37..33d858b 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -4,6 +4,10 @@ Simple x264/x265 Launcher version history
 
 Version 2.60 [unreleased]
 * Much improved validation of custom parameters
+* Massive code clean-up
+* Some minor fixes and improvements
+* Updated x264 to revision 2597
+* Updated x265 to version 1.7+470
 
 Version 2.51 [2015-04-26]
 * Fixed regression: Config files were stored in a wrong directory
diff --git a/src/version.h b/src/version.h
index 13fd8e3..da1fe54 100644
--- a/src/version.h
+++ b/src/version.h
@@ -26,7 +26,7 @@
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 6
 #define VER_X264_PATCH 0
-#define VER_X264_BUILD 965
+#define VER_X264_BUILD 966
 
 #define VER_X264_PORTABLE_EDITION (0)
 
diff --git a/src/win_addJob.cpp b/src/win_addJob.cpp
index 2a29917..70cdbf7 100644
--- a/src/win_addJob.cpp
+++ b/src/win_addJob.cpp
@@ -150,14 +150,14 @@ protected:
 				{
 					if(m_notifier)
 					{
-						m_notifier->setText(tr("Invalid parameter: %1").arg(*iter));
+						m_notifier->setText(tr("Forbidden parameter: %1").arg(*iter));
 					}
 					return true;
 				}
 			}
-			if(iter->startsWith("-", Qt::CaseInsensitive) || iter->startsWith("--", Qt::CaseInsensitive))
+			if(iter->startsWith("--", Qt::CaseInsensitive))
 			{
-				for(int i = 1; i < iter->length(); i++)
+				for(int i = 2; i < iter->length(); i++)
 				{
 					if((!iter->at(i).isLetter()) && (iter->at(i) != '-'))
 					{
@@ -194,7 +194,7 @@ protected:
 			if
 			(
 				((!doubleMinus) && iter->startsWith("--", Qt::CaseInsensitive)) ||
-				(doubleMinus && iter->startsWith("-", Qt::CaseInsensitive) && (!iter->startsWith("--", Qt::CaseInsensitive)) && (iter->length() > 2)) ||
+				(doubleMinus && iter->startsWith("-", Qt::CaseInsensitive) && (!iter->startsWith("--", Qt::CaseInsensitive)) && (iter->length() > 2) && (!iter->at(1).isDigit())) ||
 				(doubleMinus && iter->startsWith("--", Qt::CaseInsensitive) && (iter->length() < 4))
 			)
 			{