diff --git a/ScreenTask/FirewallConf.cs b/ScreenTask/FirewallConf.cs
new file mode 100644
index 0000000..ff5c6e9
--- /dev/null
+++ b/ScreenTask/FirewallConf.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NetFwTypeLib;
+
+namespace ScreenTask
+{
+    class FirewallConf
+    {
+        public void AddRule(String name, String Description,
+           NET_FW_ACTION_ Action, NET_FW_RULE_DIRECTION_ Direction, String LocalPort,
+           bool Enabled = true, int Protocole = 6, String RemoteAdresses = "localsubnet", String ApplicationName = "ScreenTask")
+        {
+            Type Policy2 = Type.GetTypeFromProgID("HNetCfg.FwPolicy2", false);
+            INetFwPolicy2 FwPolicy = (INetFwPolicy2)Activator.CreateInstance(Policy2);
+            INetFwRules rules = FwPolicy.Rules;
+            //Delete if exist to avoid deplicated rules
+            DeleteRule(name);
+            Type RuleType = Type.GetTypeFromProgID("HNetCfg.FWRule");
+            INetFwRule rule = (INetFwRule)Activator.CreateInstance(RuleType);
+
+            rule.Name = name;
+            rule.Description = Description;
+            rule.Protocol = Protocole;// TCP/IP
+            rule.LocalPorts = LocalPort;
+            rule.RemoteAddresses = RemoteAdresses;
+            rule.Action = Action;
+            rule.Direction = Direction;
+            rule.ApplicationName = ApplicationName;
+            rule.Enabled = true;
+            //Add Rule
+            rules.Add(rule);
+        }
+        public void DeleteRule(String RuleName)
+        {
+            Type Policy2 = Type.GetTypeFromProgID("HNetCfg.FwPolicy2", false);
+            INetFwPolicy2 FwPolicy = (INetFwPolicy2)Activator.CreateInstance(Policy2);
+            INetFwRules rules = FwPolicy.Rules;
+
+            rules.Remove(RuleName);
+        }
+    }
+}
diff --git a/ScreenTask/ScreenTask.csproj b/ScreenTask/ScreenTask.csproj
index 51386b7..c7fadca 100644
--- a/ScreenTask/ScreenTask.csproj
+++ b/ScreenTask/ScreenTask.csproj
@@ -53,6 +53,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="FirewallConf.cs" />
     <Compile Include="frmMain.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -102,6 +103,17 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="NetFwTypeLib">
+      <Guid>{58FBCF7C-E7A9-467C-80B3-FC65E8FCCA08}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ScreenTask/ScreenTask.sln b/ScreenTask/ScreenTask.sln
new file mode 100644
index 0000000..d95f43b
--- /dev/null
+++ b/ScreenTask/ScreenTask.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenTask", "ScreenTask.csproj", "{4C0A04E9-E7C5-4F57-AA86-2551D5136566}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4C0A04E9-E7C5-4F57-AA86-2551D5136566}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C0A04E9-E7C5-4F57-AA86-2551D5136566}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C0A04E9-E7C5-4F57-AA86-2551D5136566}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C0A04E9-E7C5-4F57-AA86-2551D5136566}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/ScreenTask/frmMain.Designer.cs b/ScreenTask/frmMain.Designer.cs
index d088038..d5a3b11 100644
--- a/ScreenTask/frmMain.Designer.cs
+++ b/ScreenTask/frmMain.Designer.cs
@@ -134,7 +134,7 @@ private void InitializeComponent()
             this.cbCaptureMouse.BackColor = System.Drawing.Color.Transparent;
             this.cbCaptureMouse.Location = new System.Drawing.Point(400, 155);
             this.cbCaptureMouse.Name = "cbCaptureMouse";
-            this.cbCaptureMouse.Size = new System.Drawing.Size(136, 17);
+            this.cbCaptureMouse.Size = new System.Drawing.Size(134, 17);
             this.cbCaptureMouse.TabIndex = 26;
             this.cbCaptureMouse.Text = "Capture Mouse Pointer";
             this.cbCaptureMouse.UseVisualStyleBackColor = false;
@@ -207,7 +207,7 @@ private void InitializeComponent()
             this.label4.BackColor = System.Drawing.Color.Transparent;
             this.label4.Location = new System.Drawing.Point(255, 159);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(63, 13);
+            this.label4.Size = new System.Drawing.Size(62, 13);
             this.label4.TabIndex = 20;
             this.label4.Text = "Password : ";
             // 
@@ -217,7 +217,7 @@ private void InitializeComponent()
             this.label3.BackColor = System.Drawing.Color.Transparent;
             this.label3.Location = new System.Drawing.Point(147, 159);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(39, 13);
+            this.label3.Size = new System.Drawing.Size(38, 13);
             this.label3.TabIndex = 19;
             this.label3.Text = "User : ";
             // 
@@ -227,7 +227,7 @@ private void InitializeComponent()
             this.cbPrivate.BackColor = System.Drawing.Color.Transparent;
             this.cbPrivate.Location = new System.Drawing.Point(47, 158);
             this.cbPrivate.Name = "cbPrivate";
-            this.cbPrivate.Size = new System.Drawing.Size(88, 17);
+            this.cbPrivate.Size = new System.Drawing.Size(89, 17);
             this.cbPrivate.TabIndex = 18;
             this.cbPrivate.Text = "Private Task ";
             this.cbPrivate.UseVisualStyleBackColor = false;
@@ -261,7 +261,7 @@ private void InitializeComponent()
             this.label2.BackColor = System.Drawing.Color.Transparent;
             this.label2.Location = new System.Drawing.Point(268, 90);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(34, 13);
+            this.label2.Size = new System.Drawing.Size(32, 13);
             this.label2.TabIndex = 16;
             this.label2.Text = "Port :";
             // 
@@ -280,7 +280,7 @@ private void InitializeComponent()
             this.label1.BackColor = System.Drawing.Color.Transparent;
             this.label1.Location = new System.Drawing.Point(8, 118);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(33, 13);
+            this.label1.Size = new System.Drawing.Size(35, 13);
             this.label1.TabIndex = 14;
             this.label1.Text = "URL :";
             // 
@@ -290,7 +290,7 @@ private void InitializeComponent()
             this.label5.BackColor = System.Drawing.Color.Transparent;
             this.label5.Location = new System.Drawing.Point(11, 88);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(24, 13);
+            this.label5.Size = new System.Drawing.Size(23, 13);
             this.label5.TabIndex = 28;
             this.label5.Text = "IP :";
             // 
@@ -314,7 +314,7 @@ private void InitializeComponent()
             this.label6.BackColor = System.Drawing.Color.Transparent;
             this.label6.Location = new System.Drawing.Point(501, 118);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(61, 13);
+            this.label6.Size = new System.Drawing.Size(63, 13);
             this.label6.TabIndex = 31;
             this.label6.Text = "Mellisecond";
             // 
diff --git a/ScreenTask/frmMain.cs b/ScreenTask/frmMain.cs
index 28e41ea..36bff74 100644
--- a/ScreenTask/frmMain.cs
+++ b/ScreenTask/frmMain.cs
@@ -14,6 +14,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using NetFwTypeLib;
 
 namespace ScreenTask
 {
@@ -286,44 +287,21 @@ private Task AddFirewallRule(int port)
         {
             return Task.Run(() =>
             {
-
-                string cmd = RunCMD("netsh advfirewall firewall show rule \"Screen Task\"");
-                if (cmd.StartsWith("\r\nNo rules match the specified criteria."))
-                {
-                    cmd = RunCMD("netsh advfirewall firewall add rule name=\"Screen Task\" dir=in action=allow remoteip=localsubnet protocol=tcp localport=" + port);
-                    if (cmd.Contains("Ok."))
-                    {
-                        Log("Screen Task Rule added to your firewall");
-                    }
-                }
-                else
-                {
-                    cmd = RunCMD("netsh advfirewall firewall delete rule name=\"Screen Task\"");
-                    cmd = RunCMD("netsh advfirewall firewall add rule name=\"Screen Task\" dir=in action=allow remoteip=localsubnet protocol=tcp localport=" + port);
-                    if (cmd.Contains("Ok."))
-                    {
-                        Log("Screen Task Rule updated to your firewall");
-                    }
+                FirewallConf cnf = new FirewallConf();
+                
+                try 
+	            {	        
+		            cnf.AddRule("Screen Task", "Allow incoming network traffic", NET_FW_ACTION_.NET_FW_ACTION_ALLOW,
+                    NET_FW_RULE_DIRECTION_.NET_FW_RULE_DIR_IN, port+"");
+                    Log("Screen Task Rule added to your firewall");
                 }
+	                catch (Exception ex)
+	                {
+		                Log(ex.Message);
+	                }
             });
 
         }
-        private string RunCMD(string cmd)
-        {
-            Process proc = new Process();
-            proc.StartInfo.FileName = "cmd.exe";
-            proc.StartInfo.Arguments = "/C " + cmd;
-            proc.StartInfo.CreateNoWindow = true;
-            proc.StartInfo.UseShellExecute = false;
-            proc.StartInfo.RedirectStandardOutput = true;
-            proc.StartInfo.RedirectStandardError = true;
-            proc.Start();
-            string res = proc.StandardOutput.ReadToEnd();
-            proc.StandardOutput.Close();
-
-            proc.Close();
-            return res;
-        }
         private void Log(string text)
         {
             txtLog.Text += DateTime.Now.ToShortDateString() + " " + DateTime.Now.ToShortTimeString() + " : " + text + "\r\n";