diff --git a/PSM/PantropyServerManager_1.0.22.exe b/PSM/PantropyServerManager_1.0.22.exe
new file mode 100644
index 00000000..e83e43f6
Binary files /dev/null and b/PSM/PantropyServerManager_1.0.22.exe differ
diff --git a/PSM/PantropyServerManager_1.0.22.zip b/PSM/PantropyServerManager_1.0.22.zip
new file mode 100644
index 00000000..390e1535
Binary files /dev/null and b/PSM/PantropyServerManager_1.0.22.zip differ
diff --git a/PSM/VersionFeed.xml b/PSM/VersionFeed.xml
index e0c84169..5b0c7250 100644
--- a/PSM/VersionFeed.xml
+++ b/PSM/VersionFeed.xml
@@ -5,7 +5,36 @@
   <title>Pantropy Server Manager Version Feed</title>
   <subtitle>This is the Pantropy Server Manager release version feed.</subtitle>
   <link href="http://servermanagers.freeforums.net/" />
-  <updated>2020-03-12T00:00:00Z</updated>
+  <updated>2020-03-15T01:00:00Z</updated>
+
+  <entry>
+    <id>urn:uuid:CE5219FC-C8C1-4684-AA5D-AE28C695D01E</id>
+    <title>1.0.22 (1.0.22.6)</title>
+    <summary>1.0.22.6</summary>
+    <link href="" />
+    <updated>2020-03-15T01: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.</li>
+            <li>Shutdown Window - have added an option to enable/disable sending the shutdown message to the game client.</li>
+            <li>Shutdown Process - have added logic to send the shutdown message to the game client, only if the setting is enabled.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
 
   <entry>
     <id>urn:uuid:CD977A08-1D8C-42CF-883B-FB66C5626452</id>
@@ -19,7 +48,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/PSM/en-US.xaml b/PSM/en-US.xaml
index 721af39c..19369c63 100644
--- a/PSM/en-US.xaml
+++ b/PSM/en-US.xaml
@@ -329,6 +329,30 @@
     <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_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>
@@ -339,6 +363,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.</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>
@@ -446,6 +472,8 @@
     <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_ShutdownLabel">Shutdown Options</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.</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>
@@ -497,6 +525,10 @@
     <sys:String x:Key="GlobalSettings_WorldSaveDelayTooltip">The number of seconds to wait for the worldsave command to complete before the server is shutdown.</sys:String>
     <sys:String x:Key="GlobalSettings_BackupWorldFileLabel">Backup World File on Shutdown</sys:String>
     <sys:String x:Key="GlobalSettings_BackupWorldFileTooltip">If enabled, a world file backup will be performed when the server is shutdown; otherwise no world save backup will be performed.</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_ResetSettings_ConfirmTitle">Confirm Settings Reset Action</sys:String>
     <sys:String x:Key="GlobalSettings_ResetSettings_ConfirmLabel">Click 'Yes' to confirm you want to perform the settings reset.</sys:String>
@@ -576,6 +608,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>
diff --git a/PSM/latest.exe b/PSM/latest.exe
index 5a0fc9e6..e83e43f6 100644
Binary files a/PSM/latest.exe and b/PSM/latest.exe differ
diff --git a/PSM/latest.txt b/PSM/latest.txt
index bb56ccda..dce42198 100644
--- a/PSM/latest.txt
+++ b/PSM/latest.txt
@@ -1 +1 @@
-1.0.21
+1.0.22
diff --git a/PSM/latest.zip b/PSM/latest.zip
index fd3b980a..390e1535 100644
Binary files a/PSM/latest.zip and b/PSM/latest.zip differ