diff --git a/ResultsBrowser/Program.cs b/ResultsBrowser/Program.cs
index 6d72837ef..ebc42ec52 100644
--- a/ResultsBrowser/Program.cs
+++ b/ResultsBrowser/Program.cs
@@ -34,11 +34,13 @@ namespace ResultsBrowser
 		
 #if (DN100 || MUNICH)
 		public const int WMsCount = 3;
-#else // if FUZHOU300|| FUZHOU150 || PT200IL || TORINO50 || BADGER_MALA_TRAT
+#elif FUZHOU300 || FUZHOU150 || PT200IL || TORINO50 || BADGER_MALA_TRAT
 		public const int WMsCount = 6;
+#elif TORUN_PT50_2015
+		public const int WMsCount = 20;
 #endif
 
-        /// <summary>
+		/// <summary>
         /// Selected procedure data
         ///  - before the main program window is open, objects referenced by this variable
         ///    are loaded from the database.
diff --git a/TestBenchFramework/BenchControl/Elde/Common.cs b/TestBenchFramework/BenchControl/Elde/Common.cs
index 3af0a004e..b39ba4170 100644
--- a/TestBenchFramework/BenchControl/Elde/Common.cs
+++ b/TestBenchFramework/BenchControl/Elde/Common.cs
@@ -12,7 +12,7 @@ namespace TBF.BenchControl.Elde
         Stop  = 2,          /// Stop the measurement
     }
 
-#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT
+#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015
     public enum StatusP : ulong
     {
         RefFlowMeterMask  = 0x7,
@@ -38,7 +38,7 @@ namespace TBF.BenchControl.Elde
 		ErrorPressMeter4  = 0x8000000000000,
 	}
 #else
-    public enum StatusP : ulong
+	public enum StatusP : ulong
     {
         RefFlowMeterMask  = 0x7,
         TestInProgress    = 0x8,
diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
index 54e872149..82bb07225 100644
--- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
+++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
@@ -83,7 +83,7 @@ namespace TBF.BenchControl.Elde
         // Array length is the reference flowmeters count plus one
 #if DN100
         public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 };
-#elif MUNICH || TORINO50 || BADGER_MALA_TRAT
+#elif MUNICH || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015
 		public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 };
 #elif FUZHOU150 || FUZHOU300 || PT200IL
 		public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 };
@@ -175,8 +175,10 @@ namespace TBF.BenchControl.Elde
             ControlComponent_Torino2015.UserControl1 ctrlBrdComponent,
 #elif BADGER_MALA_TRAT
 			ControlComponent_Torino2015.UserControl1 ctrlBrdComponent,
+#elif TORUN_PT50_2015
+			ControlComponent_Torino2015.UserControl1 ctrlBrdComponent,
 #endif
-			ulong valvesToInvert,
+ulong valvesToInvert,
             float[] tankCapacities)
         {
             this.valvesToInvert = valvesToInvert;
diff --git a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs
index ff93469c5..37fbf918f 100644
--- a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs
+++ b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs
@@ -14,7 +14,7 @@ namespace TBF.BenchControl.Elde
         /// Properties
         ///
 		public StatusP StatusP { get { return (StatusP)ctrlBrdComponent.StatusP; } }
-#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT
+#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015
         /// <summary>
         /// In case of I11, I12
         ///     referenceFreq[0] = I11 + I12
@@ -43,7 +43,7 @@ namespace TBF.BenchControl.Elde
 		public ulong RRoute { get { return ctrlBrdComponent.rRoute; } }
 		public uint DivTime { get { return ctrlBrdComponent.divTime; } }
 		public float TTime { get { return ctrlBrdComponent.Ttime; } }
-#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT
+#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015
 		public uint FmState { get { return ctrlBrdComponent.fMState[0]; } }     /// TODO: index
 #else
 		public uint FmState { get { return ctrlBrdComponent.fMState; } }
@@ -82,6 +82,8 @@ namespace TBF.BenchControl.Elde
         private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
 #elif BADGER_MALA_TRAT
         private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
+#elif TORUN_PT50_2015
+        private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
 #endif
 
 		/// <summary>
@@ -102,6 +104,8 @@ namespace TBF.BenchControl.Elde
         public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
 #elif BADGER_MALA_TRAT
         public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
+#elif TORUN_PT50_2015
+        public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
 #endif
 		{
 			this.ctrlBrdComponent = ctrlBrdComponent;
@@ -185,7 +189,7 @@ namespace TBF.BenchControl.Elde
             //                                              valveValue[0],
             //                                              valveValue[1]));
             log.InfoFormat("ValveMove(#={0}, md={1}, [{2}, {3}])", valveNo, valveMode, valveValue[0], valveValue[1]);
-#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT
+#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015
 			ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue, stableTime);
 #else
 			ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue);
diff --git a/TestBenchFramework/BenchControl/StateMachine.cs b/TestBenchFramework/BenchControl/StateMachine.cs
index 25eb39450..6d4b55f1f 100644
--- a/TestBenchFramework/BenchControl/StateMachine.cs
+++ b/TestBenchFramework/BenchControl/StateMachine.cs
@@ -194,6 +194,8 @@ namespace TBF.BenchControl
         public static void InitializeBoardEtc(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
 #elif BADGER_MALA_TRAT
         public static void InitializeBoardEtc(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
+#elif TORUN_PT50_2015
+        public static void InitializeBoardEtc(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
 #endif
 		{
             /// Load the list of components (entities) from the database.
diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs
index 68fb98b36..27cffc53b 100644
--- a/TestBenchFramework/MainWnd.Designer.cs
+++ b/TestBenchFramework/MainWnd.Designer.cs
@@ -587,6 +587,8 @@ namespace TBF
 		private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
 #elif BADGER_MALA_TRAT
 		private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
+#elif TORUN_PT50_2015
+		private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
 #endif
 
 		private System.Windows.Forms.ToolStripMenuItem benchTSMenuItem;
diff --git a/TestBenchFramework/Program.cs b/TestBenchFramework/Program.cs
index 811ea3cd6..e288bc697 100644
--- a/TestBenchFramework/Program.cs
+++ b/TestBenchFramework/Program.cs
@@ -38,8 +38,10 @@ namespace TBF
 		
 #if DN100 || MUNICH
 		public const int WMsCount = 3;
-#else // if FUZHOU300 || FUZHOU150 || PT200IL || TORINO50 || BADGER_MALA_TRAT
+#elif FUZHOU300 || FUZHOU150 || PT200IL || TORINO50 || BADGER_MALA_TRAT
 		public const int WMsCount = 6;
+#elif TORUN_PT50_2015
+		public const int WMsCount = 20;
 #endif
 
 		/// <summary>