diff --git a/CSM/ConanServerManager_1.0.23.exe b/CSM/ConanServerManager_1.0.23.exe
new file mode 100644
index 00000000..bb7457f5
Binary files /dev/null and b/CSM/ConanServerManager_1.0.23.exe differ
diff --git a/CSM/ConanServerManager_1.0.23.zip b/CSM/ConanServerManager_1.0.23.zip
new file mode 100644
index 00000000..cd0497da
Binary files /dev/null and b/CSM/ConanServerManager_1.0.23.zip differ
diff --git a/CSM/VersionFeed.xml b/CSM/VersionFeed.xml
index 4a3b5096..0066bc06 100644
--- a/CSM/VersionFeed.xml
+++ b/CSM/VersionFeed.xml
@@ -5,7 +5,37 @@
   <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-03-23T00:00:00Z</updated>
+  <updated>2020-04-01T02:00:00Z</updated>
+
+  <entry>
+    <id>urn:uuid:AFF6E785-595E-47B9-82AF-526CD0BBBBA4</id>
+    <title>1.0.23 (1.0.23.10)</title>
+    <summary>1.0.23.10</summary>
+    <link href="" />
+    <updated>2020-04-01T02: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 Setting - Added new Auto Restart section with options to enable/disable auto restart grace period.</li>
+            <li>Starting a Server - when you server is started, it now records the last started time in your profiles.</li>
+            <li>Auto-Restart - with the grace period option enabled, when the auto-restart process runs it will check if your server was started within the grace period and skip; otherwise it will restart as normal.</li>
+          </ul>
+          <u style="font-size: .9em;">CHANGE</u>
+          <br/>
+          <ul>
+            <li>RCON Window - added adjustable player list, width is retained.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
 
   <entry>
     <id>urn:uuid:B33EF359-E372-4BA6-BC43-B8AC59939DEA</id>
diff --git a/CSM/en-US.xaml b/CSM/en-US.xaml
index f32b9fd5..b1e4c623 100644
--- a/CSM/en-US.xaml
+++ b/CSM/en-US.xaml
@@ -605,11 +605,13 @@
     <sys:String x:Key="GlobalSettings_SteamAPIKeyButtonLabel">Get WebApi Key...</sys:String>
     <sys:String x:Key="GlobalSettings_SteamAPIKeyHelpButtonLabel">Help...</sys:String>
     <sys:String x:Key="GlobalSettings_LanguageSelectionLabel">Language</sys:String>
+    
     <sys:String x:Key="GlobalSettings_ServerStatusLabel">Server Status Options</sys:String>
     <sys:String x:Key="GlobalSettings_EnableServerStatusActionsLabel">Enable Server Status Actions</sys:String>
     <sys:String x:Key="GlobalSettings_EnableServerStatusActionsTooltip">If enabled, clicking the server status icons may perform one or mroe actions.</sys:String>
     <sys:String x:Key="GlobalSettings_ShowServerStatusActionConfirmationLabel">Show Server Status Action Confirmation</sys:String>
     <sys:String x:Key="GlobalSettings_ShowServerStatusActionConfirmationTooltip">If enabled, a dialogue will be shown to confirmation the server status action.</sys:String>
+    
     <sys:String x:Key="GlobalSettings_ServerStartupLabel">Server Startup Options</sys:String>
     <sys:String x:Key="GlobalSettings_ValidateProfileOnServerStartLabel">Validate profile on server start</sys:String>
     <sys:String x:Key="GlobalSettings_ValidateProfileOnServerStartTooltip">If enabled, when you manually start the server, a basic validation is performed on the server and mod files.</sys:String>
@@ -676,6 +678,12 @@
     <sys:String x:Key="GlobalSettings_SequencialDelayPeriodLabel">Delay between each server update</sys:String>
     <sys:String x:Key="GlobalSettings_SequencialDelayPeriodTooltip">The amount of time to wait in between each server update, only available if Parallel Update is disabled.</sys:String>
 
+    <sys:String x:Key="GlobalSettings_AutoRestartLabel">Auto Restart Options</sys:String>
+    <sys:String x:Key="GlobalSettings_EnableRestartGraceIntervalLabel">Enable Grace Period</sys:String>
+    <sys:String x:Key="GlobalSettings_EnableRestartGraceIntervalTooltip">If enabled, it will check if the server was last started with the grace period and skip; otherwise if not last started within the grace period the server will be restarted.</sys:String>
+    <sys:String x:Key="GlobalSettings_RestartGraceIntervalLabel">Grace Period:</sys:String>
+    <sys:String x:Key="GlobalSettings_RestartGraceIntervalTooltip">The amount of time in minutes to prevent the server restarting, since the last server start.</sys:String>
+
     <sys:String x:Key="GlobalSettings_ShutdownLabel">Shutdown Options</sys:String>
     <sys:String x:Key="GlobalSettings_ShutdownMessageInformationLabel">These warning messages will only be broadcast to your server if RCON is enabled and the RCON port set on your server profile.</sys:String>
     <sys:String x:Key="GlobalSettings_SendShutdownMessagesLabel">Send Shutdown Messages to Game Client</sys:String>
diff --git a/CSM/latest.exe b/CSM/latest.exe
index cc518639..bb7457f5 100644
Binary files a/CSM/latest.exe and b/CSM/latest.exe differ
diff --git a/CSM/latest.txt b/CSM/latest.txt
index dce42198..e9a589a6 100644
--- a/CSM/latest.txt
+++ b/CSM/latest.txt
@@ -1 +1 @@
-1.0.22
+1.0.23
diff --git a/CSM/latest.zip b/CSM/latest.zip
index 5dfa0f31..cd0497da 100644
Binary files a/CSM/latest.zip and b/CSM/latest.zip differ