diff --git a/CSM/ConanServerManager_1.1.50.exe b/CSM/ConanServerManager_1.1.50.exe
new file mode 100644
index 00000000..a3e63144
Binary files /dev/null and b/CSM/ConanServerManager_1.1.50.exe differ
diff --git a/CSM/ConanServerManager_1.1.50.zip b/CSM/ConanServerManager_1.1.50.zip
new file mode 100644
index 00000000..75c3ac14
Binary files /dev/null and b/CSM/ConanServerManager_1.1.50.zip differ
diff --git a/CSM/VersionFeed.xml b/CSM/VersionFeed.xml
index e822b826..acdbd3d6 100644
--- a/CSM/VersionFeed.xml
+++ b/CSM/VersionFeed.xml
@@ -5,7 +5,30 @@
   <title>Conan Server Manager Version Feed</title>
   <subtitle>This is the Conan Server Manager release version feed.</subtitle>
   <link href="http://servermanagers.freeforums.net/" />
-  <updated>2020-11-10T00:00:00Z</updated>
+  <updated>2020-11-25T00:00:00Z</updated>
+
+  <entry>
+    <id>urn:uuid:6914861A-2D4E-4F08-89A3-D3D7A77F74C1</id>
+    <title>1.1.50 (1.1.50.1)</title>
+    <summary>1.1.50.1</summary>
+    <link href="" />
+    <updated>2020-11-25T00:00:00Z</updated>
+    <content type="xhtml">
+      <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
+        <p>
+          <u style="font-size: .9em;">NEW</u>
+          <br/>
+          <ul>
+            <li>Global Settings - Added option to automatically manage the Public IP, default to True. If disabled, then the Public IP must be updated manually.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
 
   <entry>
     <id>urn:uuid:B16E389F-EB2F-43DE-8802-1FD5FE09E90A</id>
diff --git a/CSM/en-US.xaml b/CSM/en-US.xaml
index 551e807d..ce4bffb4 100644
--- a/CSM/en-US.xaml
+++ b/CSM/en-US.xaml
@@ -625,6 +625,7 @@
     <sys:String x:Key="GlobalSettings_RunAsAdministratorLabel">Enable Run as Administrator Prompt on Startup</sys:String>
     <sys:String x:Key="GlobalSettings_MinimizeToTrayLabel">Minimize To Tray</sys:String>
     <sys:String x:Key="GlobalSettings_ManageFirewallLabel">Manage firewall settings automatically</sys:String>
+    <sys:String x:Key="GlobalSettings_ManagePublicIPLabel">Manage Public IP automatically</sys:String>
     <sys:String x:Key="GlobalSettings_DataDirectoryLabel">Data Directory:</sys:String>
     <sys:String x:Key="GlobalSettings_BackupDirectoryLabel">Backup Directory:</sys:String>
     <sys:String x:Key="GlobalSettings_SteamAPIKeyLabel">Steam WebApi Key:</sys:String>
diff --git a/CSM/latest.exe b/CSM/latest.exe
index 70261753..a3e63144 100644
Binary files a/CSM/latest.exe and b/CSM/latest.exe differ
diff --git a/CSM/latest.txt b/CSM/latest.txt
index 2e7a360f..59fd21ec 100644
--- a/CSM/latest.txt
+++ b/CSM/latest.txt
@@ -1 +1 @@
-1.1.49
+1.1.50
diff --git a/CSM/latest.zip b/CSM/latest.zip
index 169356ae..75c3ac14 100644
Binary files a/CSM/latest.zip and b/CSM/latest.zip differ