diff --git a/CSM/ConanServerManager_1.0.21.exe b/CSM/ConanServerManager_1.0.21.exe
new file mode 100644
index 00000000..b29ceeb0
Binary files /dev/null and b/CSM/ConanServerManager_1.0.21.exe differ
diff --git a/CSM/ConanServerManager_1.0.21.zip b/CSM/ConanServerManager_1.0.21.zip
new file mode 100644
index 00000000..48b11155
Binary files /dev/null and b/CSM/ConanServerManager_1.0.21.zip differ
diff --git a/CSM/VersionFeed.xml b/CSM/VersionFeed.xml
index dcd9d8f9..0c8145b9 100644
--- a/CSM/VersionFeed.xml
+++ b/CSM/VersionFeed.xml
@@ -5,7 +5,41 @@
   <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-12T00:00:00Z</updated>
+  <updated>2020-03-16T00:00:00Z</updated>
+
+  <entry>
+    <id>urn:uuid:0DB80A69-BA80-4451-A3C2-58C1918F5FBA</id>
+    <title>1.0.21 (1.0.21.8)</title>
+    <summary>1.0.21.8</summary>
+    <link href="" />
+    <updated>2020-03-16T00: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>Main Window - the main window now stores the height and width of the window.</li>
+            <li>Main Window - new button (top right corner) to open the new Server Monitor window.</li>
+            <li>Server Monitor Window - new window that shows all you servers in one form. Allows you to Start, Stop, Update/Verify and open the Player List or RCON Windows.</li>
+            <li>Server Monitor Window - includes a button to create a shortcut on your desktop that can start the Server Monitor directly, without the server manager.</li>
+            <li>Global Settings - Shutdown Options - have added an option to enable/disable sending the shutdown message to the game client via RCON.</li>
+            <li>Shutdown Window - have added an option to enable/disable sending the shutdown message to the game client via RCON.</li>
+            <li>Shutdown Process - have added logic to send the shutdown message to the game client via RCON, only if the setting is enabled.</li>
+          </ul>
+          <u style="font-size: .9em;">CHANGE</u>
+          <br/>
+          <ul>
+            <li>fr-FR Translation file updated. (thanks @angemymy)</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
 
   <entry>
     <id>urn:uuid:DEA5605F-8087-4BC5-A344-B1443BFFE919</id>
@@ -19,7 +53,7 @@
           <u style="font-size: .9em;">BUGFIX</u>
           <br/>
           <ul>
-            <li>Game Data - have crash when loading with an invalid gamedata file.</li>
+            <li>Game Data - fixed a crash when loading with an invalid gamedata file.</li>
           </ul>
           <u style="font-size: .9em;">CHANGE</u>
           <br/>
diff --git a/CSM/en-US.xaml b/CSM/en-US.xaml
index 2e8f5850..f32b9fd5 100644
--- a/CSM/en-US.xaml
+++ b/CSM/en-US.xaml
@@ -303,6 +303,31 @@
     <sys:String x:Key="PluginsWindow_AddFilterExtension">*.dll</sys:String>
     <!--#endregion-->
 
+    <!--#region Server Monitor Window -->
+    <sys:String x:Key="ServerMonitor_Title">Server Monitor</sys:String>
+
+    <sys:String x:Key="ServerMonitor_TotalCountLabel">Total Servers:</sys:String>
+    <sys:String x:Key="ServerMonitor_ServerColumnLabel">Server</sys:String>
+    <sys:String x:Key="ServerMonitor_MapColumnLabel">Map</sys:String>
+    <sys:String x:Key="ServerMonitor_ModsColumnLabel">Mods</sys:String>
+    <sys:String x:Key="ServerMonitor_VersionColumnLabel">Version</sys:String>
+    <sys:String x:Key="ServerMonitor_PlayersColumnLabel">Players</sys:String>
+    <sys:String x:Key="ServerMonitor_StatusColumnLabel">Status</sys:String>
+
+    <sys:String x:Key="ServerMonitor_CreateShortcutButtonTooltip">Create a desktop shortcut to open this form directly.</sys:String>
+    <sys:String x:Key="ServerMonitor_PlayerListButtonTooltip">Open the Player List window.</sys:String>
+    <sys:String x:Key="ServerMonitor_RCONButtonTooltip">Open the RCON window.</sys:String>
+    <sys:String x:Key="ServerMonitor_StartServerTooltip">Start the server.</sys:String>
+    <sys:String x:Key="ServerMonitor_StopServerTooltip">Stop the server.</sys:String>
+    <sys:String x:Key="ServerMonitor_InstallServerTooltip">Install the server.</sys:String>
+    <sys:String x:Key="ServerMonitor_UpgradeServerTooltip">Update/Verify the server.</sys:String>
+
+    <sys:String x:Key="ServerMonitor_UpgradeServer_FailedTitle">Server Update Error</sys:String>
+    <sys:String x:Key="ServerMonitor_UpgradeServer_FailedLabel">Another server is being upgraded, wait until the upgrade has finished and try again.</sys:String>
+    <sys:String x:Key="ServerMonitor_CloseWindow_ConfirmTitle">Confirm Window Close</sys:String>
+    <sys:String x:Key="ServerMonitor_CloseWindow_ConfirmLabel">You are currently perform a server update, closing the window with disconnect you from steamcmd. Do you want to continue closing the window?</sys:String>
+    <!--#endregion-->
+
     <!--#region Shutdown Window -->
     <sys:String x:Key="ShutdownWindow_Title">Server Shutdown</sys:String>
     <sys:String x:Key="ShutdownWindow_ProfileTitle">Server Shutdown - {0}</sys:String>
@@ -313,6 +338,8 @@
     <sys:String x:Key="ShutdownWindow_RestartServerTooltip">If enabled, the server will be immediately restarted after it is shutdown.</sys:String>
     <sys:String x:Key="ShutdownWindow_UpdateServerLabel">Update server after shutdown</sys:String>
     <sys:String x:Key="ShutdownWindow_UpdateServerTooltip">If enabled, the server will be updated after it is shutdown.</sys:String>
+    <sys:String x:Key="ShutdownWindow_SendShutdownMessagesLabel">Send Shutdown Messages to Game Client</sys:String>
+    <sys:String x:Key="ShutdownWindow_SendShutdownMessagesTooltip">If enabled, the shutdown messages will be sent to the game client via RCON. NOTE: RCON must be enable on the server.</sys:String>
     <sys:String x:Key="ShutdownWindow_BackupWorldFileLabel">Backup world file after shutdown</sys:String>
     <sys:String x:Key="ShutdownWindow_BackupWorldFileTooltip">If enabled, the world file will be backed up after shutdown.</sys:String>
     <sys:String x:Key="ShutdownWindow_ShutdownReasonLabel">Reason (optional):</sys:String>
@@ -499,6 +526,7 @@
     <sys:String x:Key="MainWindow_OpenGameDataTooltip">Open Game Data</sys:String>
     <sys:String x:Key="MainWindow_OpenPluginsTooltip">Open Plugins</sys:String>
     <sys:String x:Key="MainWindow_OpenHelpTooltip">Open Help</sys:String>
+    <sys:String x:Key="MainWindow_OpenServerMonitorTooltip">Open Server Monitor</sys:String>
     <sys:String x:Key="MainWindow_UpdateToLabelFormat">Upgrade to {0} now!</sys:String>
     <sys:String x:Key="MainWindow_TaskStatusLabel">Task Status</sys:String>
     <sys:String x:Key="MainWindow_TaskAdminErrorTitle">Requires Administration Permissions</sys:String>
@@ -621,6 +649,10 @@
     <sys:String x:Key="GlobalSettings_DeleteIntervalTooltip">How old the backup file must be to be deleted in days.</sys:String>
     <sys:String x:Key="GlobalSettings_BackupWorldSaveLabel">WorldSave Message:</sys:String>
     <sys:String x:Key="GlobalSettings_BackupWorldSaveTooltip">This message will be displayed upon backup when the world is about to be saved.</sys:String>
+    <sys:String x:Key="GlobalSettings_VerifyServerAfterUpdateLabel">Verify Server Files After Auto Update</sys:String>
+    <sys:String x:Key="GlobalSettings_VerifyServerAfterUpdateTooltip">If enabled, after the server has been updated from the cache, it will perform a server verification using steamcmd.</sys:String>
+    <sys:String x:Key="GlobalSettings_UpdateDirectoryPermissionsLabel">Update Directory Permissions on Save</sys:String>
+    <sys:String x:Key="GlobalSettings_UpdateDirectoryPermissionsTooltip">If enabled, when a save is performed, all folders under the server directory will be have the permissions check and if necessary fixed. WARNING: Disabling could prevent your server from running properly.</sys:String>
 
     <sys:String x:Key="GlobalSettings_AutoUpdateLabel">Enable Auto Update</sys:String>
     <sys:String x:Key="GlobalSettings_CacheDirectoryLabel">Cache Directory:</sys:String>
@@ -645,6 +677,9 @@
     <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_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>
+    <sys:String x:Key="GlobalSettings_SendShutdownMessagesTooltip">If enabled, the shutdown messages will be sent to the game client via RCON. NOTE: RCON must be enable on the server.</sys:String>
     <sys:String x:Key="GlobalSettings_ShutdownGraceIntervalLabel">Grace Period:</sys:String>
     <sys:String x:Key="GlobalSettings_ShutdownGraceIntervalTooltip">The amount of time in minutes to broadcast messages about the upgrade before shutting down and upgrading the server.</sys:String>
     <sys:String x:Key="GlobalSettings_ShutdownMessage1Label">Message 1:</sys:String>
diff --git a/CSM/latest.exe b/CSM/latest.exe
index b04ec58a..b29ceeb0 100644
Binary files a/CSM/latest.exe and b/CSM/latest.exe differ
diff --git a/CSM/latest.txt b/CSM/latest.txt
index e4b14eaf..bb56ccda 100644
--- a/CSM/latest.txt
+++ b/CSM/latest.txt
@@ -1 +1 @@
-1.0.20
+1.0.21
diff --git a/CSM/latest.zip b/CSM/latest.zip
index 90e35065..48b11155 100644
Binary files a/CSM/latest.zip and b/CSM/latest.zip differ