diff --git a/Lab5Client/build.gradle.kts b/Lab5Client/build.gradle.kts
index 8294567..791bc3a 100644
--- a/Lab5Client/build.gradle.kts
+++ b/Lab5Client/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "ru.erius.lab5"
-version = "2.0"
+version = "2.1"
 val mainClass = "client.Lab5Client"
 
 repositories {
diff --git a/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandler$ExecuteScriptCommand.class b/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandler$ExecuteScriptCommand.class
index 9dac597..aac5ff9 100644
Binary files a/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandler$ExecuteScriptCommand.class and b/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandler$ExecuteScriptCommand.class differ
diff --git a/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandler$ModeCommand.class b/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandler$ModeCommand.class
index e20d78b..b5fb194 100644
Binary files a/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandler$ModeCommand.class and b/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandler$ModeCommand.class differ
diff --git a/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandler.class b/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandler.class
index 5b8312c..94eee7b 100644
Binary files a/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandler.class and b/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandler.class differ
diff --git a/Lab5Client/build/classes/java/main/client/net/UDPClient.class b/Lab5Client/build/classes/java/main/client/net/UDPClient.class
index 66b61dc..a3a55f0 100644
Binary files a/Lab5Client/build/classes/java/main/client/net/UDPClient.class and b/Lab5Client/build/classes/java/main/client/net/UDPClient.class differ
diff --git a/Lab5Client/build/docs/javadoc/allclasses-frame.html b/Lab5Client/build/docs/javadoc/allclasses-frame.html
index 493897a..8e0adbe 100644
--- a/Lab5Client/build/docs/javadoc/allclasses-frame.html
+++ b/Lab5Client/build/docs/javadoc/allclasses-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (Lab5Client 2.0 API)</title>
+<title>All Classes (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -17,6 +17,7 @@
 <li><a href="client/commandline/pdcommands/ClearCommand.html" title="class in client.commandline.pdcommands" target="classFrame">ClearCommand</a></li>
 <li><a href="client/commandline/Command.html" title="class in client.commandline" target="classFrame">Command</a></li>
 <li><a href="client/commandline/CommandLineHandler.html" title="class in client.commandline" target="classFrame">CommandLineHandler</a></li>
+<li><a href="client/commandline/CommandLineHandler.ConnectionCommand.html" title="class in client.commandline" target="classFrame">CommandLineHandler.ConnectionCommand</a></li>
 <li><a href="client/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in client.commandline" target="classFrame">CommandLineHandler.ExecuteScriptCommand</a></li>
 <li><a href="client/commandline/CommandLineHandler.ExitCommand.html" title="class in client.commandline" target="classFrame">CommandLineHandler.ExitCommand</a></li>
 <li><a href="client/commandline/CommandLineHandler.HistoryCommand.html" title="class in client.commandline" target="classFrame">CommandLineHandler.HistoryCommand</a></li>
diff --git a/Lab5Client/build/docs/javadoc/allclasses-noframe.html b/Lab5Client/build/docs/javadoc/allclasses-noframe.html
index f4512ab..82c9d84 100644
--- a/Lab5Client/build/docs/javadoc/allclasses-noframe.html
+++ b/Lab5Client/build/docs/javadoc/allclasses-noframe.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (Lab5Client 2.0 API)</title>
+<title>All Classes (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -17,6 +17,7 @@
 <li><a href="client/commandline/pdcommands/ClearCommand.html" title="class in client.commandline.pdcommands">ClearCommand</a></li>
 <li><a href="client/commandline/Command.html" title="class in client.commandline">Command</a></li>
 <li><a href="client/commandline/CommandLineHandler.html" title="class in client.commandline">CommandLineHandler</a></li>
+<li><a href="client/commandline/CommandLineHandler.ConnectionCommand.html" title="class in client.commandline">CommandLineHandler.ConnectionCommand</a></li>
 <li><a href="client/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in client.commandline">CommandLineHandler.ExecuteScriptCommand</a></li>
 <li><a href="client/commandline/CommandLineHandler.ExitCommand.html" title="class in client.commandline">CommandLineHandler.ExitCommand</a></li>
 <li><a href="client/commandline/CommandLineHandler.HistoryCommand.html" title="class in client.commandline">CommandLineHandler.HistoryCommand</a></li>
diff --git a/Lab5Client/build/docs/javadoc/client/Lab5Client.html b/Lab5Client/build/docs/javadoc/client/Lab5Client.html
index 393446a..99b4767 100644
--- a/Lab5Client/build/docs/javadoc/client/Lab5Client.html
+++ b/Lab5Client/build/docs/javadoc/client/Lab5Client.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Lab5Client (Lab5Client 2.0 API)</title>
+<title>Lab5Client (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Lab5Client (Lab5Client 2.0 API)";
+            parent.document.title="Lab5Client (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/Command.html b/Lab5Client/build/docs/javadoc/client/commandline/Command.html
index 9aa6b54..0d1c2b8 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/Command.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/Command.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Command (Lab5Client 2.0 API)</title>
+<title>Command (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Command (Lab5Client 2.0 API)";
+            parent.document.title="Command (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
@@ -111,7 +111,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a href="../../client/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in client.commandline">CommandLineHandler.ExecuteScriptCommand</a>, <a href="../../client/commandline/CommandLineHandler.ExitCommand.html" title="class in client.commandline">CommandLineHandler.ExitCommand</a>, <a href="../../client/commandline/CommandLineHandler.HistoryCommand.html" title="class in client.commandline">CommandLineHandler.HistoryCommand</a>, <a href="../../client/commandline/CommandLineHandler.ModeCommand.html" title="class in client.commandline">CommandLineHandler.ModeCommand</a>, <a href="../../client/commandline/CommandRegistry.HelpCommand.html" title="class in client.commandline">CommandRegistry.HelpCommand</a>, <a href="../../client/commandline/pdcommands/PeopleDatabaseCommand.html" title="class in client.commandline.pdcommands">PeopleDatabaseCommand</a></dd>
+<dd><a href="../../client/commandline/CommandLineHandler.ConnectionCommand.html" title="class in client.commandline">CommandLineHandler.ConnectionCommand</a>, <a href="../../client/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in client.commandline">CommandLineHandler.ExecuteScriptCommand</a>, <a href="../../client/commandline/CommandLineHandler.ExitCommand.html" title="class in client.commandline">CommandLineHandler.ExitCommand</a>, <a href="../../client/commandline/CommandLineHandler.HistoryCommand.html" title="class in client.commandline">CommandLineHandler.HistoryCommand</a>, <a href="../../client/commandline/CommandLineHandler.ModeCommand.html" title="class in client.commandline">CommandLineHandler.ModeCommand</a>, <a href="../../client/commandline/CommandRegistry.HelpCommand.html" title="class in client.commandline">CommandRegistry.HelpCommand</a>, <a href="../../client/commandline/pdcommands/PeopleDatabaseCommand.html" title="class in client.commandline.pdcommands">PeopleDatabaseCommand</a></dd>
 </dl>
 <hr>
 <br>
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.ExecuteScriptCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.ExecuteScriptCommand.html
index 1a97727..cf1b985 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.ExecuteScriptCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.ExecuteScriptCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>CommandLineHandler.ExecuteScriptCommand (Lab5Client 2.0 API)</title>
+<title>CommandLineHandler.ExecuteScriptCommand (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLineHandler.ExecuteScriptCommand (Lab5Client 2.0 API)";
+            parent.document.title="CommandLineHandler.ExecuteScriptCommand (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
@@ -47,7 +47,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../client/commandline/CommandLineHandler.html" title="class in client.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../client/commandline/CommandLineHandler.ConnectionCommand.html" title="class in client.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../client/commandline/CommandLineHandler.ExitCommand.html" title="class in client.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -266,7 +266,7 @@ extends <a href="../../client/commandline/Command.html" title="class in client.c
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../client/commandline/CommandLineHandler.html" title="class in client.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../client/commandline/CommandLineHandler.ConnectionCommand.html" title="class in client.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../client/commandline/CommandLineHandler.ExitCommand.html" title="class in client.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.ExitCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.ExitCommand.html
index 3fec705..1116de8 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.ExitCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.ExitCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>CommandLineHandler.ExitCommand (Lab5Client 2.0 API)</title>
+<title>CommandLineHandler.ExitCommand (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLineHandler.ExitCommand (Lab5Client 2.0 API)";
+            parent.document.title="CommandLineHandler.ExitCommand (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.HistoryCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.HistoryCommand.html
index 1add7c0..2db9df4 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.HistoryCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.HistoryCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>CommandLineHandler.HistoryCommand (Lab5Client 2.0 API)</title>
+<title>CommandLineHandler.HistoryCommand (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLineHandler.HistoryCommand (Lab5Client 2.0 API)";
+            parent.document.title="CommandLineHandler.HistoryCommand (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.ModeCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.ModeCommand.html
index ae3bc1e..bc72220 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.ModeCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.ModeCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>CommandLineHandler.ModeCommand (Lab5Client 2.0 API)</title>
+<title>CommandLineHandler.ModeCommand (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLineHandler.ModeCommand (Lab5Client 2.0 API)";
+            parent.document.title="CommandLineHandler.ModeCommand (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.html b/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.html
index 593e4df..9f8b1d2 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandler.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>CommandLineHandler (Lab5Client 2.0 API)</title>
+<title>CommandLineHandler (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLineHandler (Lab5Client 2.0 API)";
+            parent.document.title="CommandLineHandler (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../client/commandline/Command.html" title="class in client.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../client/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in client.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../client/commandline/CommandLineHandler.ConnectionCommand.html" title="class in client.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?client/commandline/CommandLineHandler.html" target="_top">Frames</a></li>
@@ -136,18 +136,22 @@ extends java.lang.Object</pre>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../client/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in client.commandline">CommandLineHandler.ExecuteScriptCommand</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../client/commandline/CommandLineHandler.ConnectionCommand.html" title="class in client.commandline">CommandLineHandler.ConnectionCommand</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../client/commandline/CommandLineHandler.ExitCommand.html" title="class in client.commandline">CommandLineHandler.ExitCommand</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../client/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in client.commandline">CommandLineHandler.ExecuteScriptCommand</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../client/commandline/CommandLineHandler.HistoryCommand.html" title="class in client.commandline">CommandLineHandler.HistoryCommand</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../client/commandline/CommandLineHandler.ExitCommand.html" title="class in client.commandline">CommandLineHandler.ExitCommand</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../client/commandline/CommandLineHandler.HistoryCommand.html" title="class in client.commandline">CommandLineHandler.HistoryCommand</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../client/commandline/CommandLineHandler.ModeCommand.html" title="class in client.commandline">CommandLineHandler.ModeCommand</a></span></code>&nbsp;</td>
 </tr>
 </table>
@@ -387,7 +391,7 @@ extends java.lang.Object</pre>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../client/commandline/Command.html" title="class in client.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../client/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in client.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../client/commandline/CommandLineHandler.ConnectionCommand.html" title="class in client.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?client/commandline/CommandLineHandler.html" target="_top">Frames</a></li>
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/CommandRegistry.CommandAlreadyExistsException.html b/Lab5Client/build/docs/javadoc/client/commandline/CommandRegistry.CommandAlreadyExistsException.html
index 75030e8..d16dd53 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/CommandRegistry.CommandAlreadyExistsException.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/CommandRegistry.CommandAlreadyExistsException.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>CommandRegistry.CommandAlreadyExistsException (Lab5Client 2.0 API)</title>
+<title>CommandRegistry.CommandAlreadyExistsException (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandRegistry.CommandAlreadyExistsException (Lab5Client 2.0 API)";
+            parent.document.title="CommandRegistry.CommandAlreadyExistsException (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/CommandRegistry.CommandNotFoundException.html b/Lab5Client/build/docs/javadoc/client/commandline/CommandRegistry.CommandNotFoundException.html
index 31887eb..4c85bb8 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/CommandRegistry.CommandNotFoundException.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/CommandRegistry.CommandNotFoundException.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>CommandRegistry.CommandNotFoundException (Lab5Client 2.0 API)</title>
+<title>CommandRegistry.CommandNotFoundException (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandRegistry.CommandNotFoundException (Lab5Client 2.0 API)";
+            parent.document.title="CommandRegistry.CommandNotFoundException (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/CommandRegistry.HelpCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/CommandRegistry.HelpCommand.html
index 6322a2a..9ff32fc 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/CommandRegistry.HelpCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/CommandRegistry.HelpCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>CommandRegistry.HelpCommand (Lab5Client 2.0 API)</title>
+<title>CommandRegistry.HelpCommand (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandRegistry.HelpCommand (Lab5Client 2.0 API)";
+            parent.document.title="CommandRegistry.HelpCommand (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/CommandRegistry.html b/Lab5Client/build/docs/javadoc/client/commandline/CommandRegistry.html
index 11e3c59..c54d98a 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/CommandRegistry.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/CommandRegistry.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>CommandRegistry (Lab5Client 2.0 API)</title>
+<title>CommandRegistry (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandRegistry (Lab5Client 2.0 API)";
+            parent.document.title="CommandRegistry (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/LongStrings.html b/Lab5Client/build/docs/javadoc/client/commandline/LongStrings.html
index cb28d80..92f512d 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/LongStrings.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/LongStrings.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>LongStrings (Lab5Client 2.0 API)</title>
+<title>LongStrings (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="LongStrings (Lab5Client 2.0 API)";
+            parent.document.title="LongStrings (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/package-frame.html b/Lab5Client/build/docs/javadoc/client/commandline/package-frame.html
index f977d5f..075450a 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/package-frame.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client.commandline (Lab5Client 2.0 API)</title>
+<title>client.commandline (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -14,6 +14,7 @@
 <ul title="Classes">
 <li><a href="Command.html" title="class in client.commandline" target="classFrame">Command</a></li>
 <li><a href="CommandLineHandler.html" title="class in client.commandline" target="classFrame">CommandLineHandler</a></li>
+<li><a href="CommandLineHandler.ConnectionCommand.html" title="class in client.commandline" target="classFrame">CommandLineHandler.ConnectionCommand</a></li>
 <li><a href="CommandLineHandler.ExecuteScriptCommand.html" title="class in client.commandline" target="classFrame">CommandLineHandler.ExecuteScriptCommand</a></li>
 <li><a href="CommandLineHandler.ExitCommand.html" title="class in client.commandline" target="classFrame">CommandLineHandler.ExitCommand</a></li>
 <li><a href="CommandLineHandler.HistoryCommand.html" title="class in client.commandline" target="classFrame">CommandLineHandler.HistoryCommand</a></li>
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/package-summary.html b/Lab5Client/build/docs/javadoc/client/commandline/package-summary.html
index ebc63df..2d6db0f 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/package-summary.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client.commandline (Lab5Client 2.0 API)</title>
+<title>client.commandline (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="client.commandline (Lab5Client 2.0 API)";
+            parent.document.title="client.commandline (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
@@ -93,28 +93,32 @@
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a href="../../client/commandline/CommandLineHandler.ConnectionCommand.html" title="class in client.commandline">CommandLineHandler.ConnectionCommand</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../client/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in client.commandline">CommandLineHandler.ExecuteScriptCommand</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../client/commandline/CommandLineHandler.ExitCommand.html" title="class in client.commandline">CommandLineHandler.ExitCommand</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../client/commandline/CommandLineHandler.HistoryCommand.html" title="class in client.commandline">CommandLineHandler.HistoryCommand</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../client/commandline/CommandLineHandler.ModeCommand.html" title="class in client.commandline">CommandLineHandler.ModeCommand</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../client/commandline/CommandRegistry.html" title="class in client.commandline">CommandRegistry</a></td>
 <td class="colLast">
 <div class="block">Класс регистра команд, используемый для добавления, переопределения или удаления команд</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../client/commandline/CommandRegistry.HelpCommand.html" title="class in client.commandline">CommandRegistry.HelpCommand</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/package-tree.html b/Lab5Client/build/docs/javadoc/client/commandline/package-tree.html
index db1a74c..5291a2a 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/package-tree.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client.commandline Class Hierarchy (Lab5Client 2.0 API)</title>
+<title>client.commandline Class Hierarchy (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="client.commandline Class Hierarchy (Lab5Client 2.0 API)";
+            parent.document.title="client.commandline Class Hierarchy (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
@@ -81,6 +81,7 @@
 <ul>
 <li type="circle">client.commandline.<a href="../../client/commandline/Command.html" title="class in client.commandline"><span class="typeNameLink">Command</span></a> (implements java.io.Serializable)
 <ul>
+<li type="circle">client.commandline.<a href="../../client/commandline/CommandLineHandler.ConnectionCommand.html" title="class in client.commandline"><span class="typeNameLink">CommandLineHandler.ConnectionCommand</span></a></li>
 <li type="circle">client.commandline.<a href="../../client/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in client.commandline"><span class="typeNameLink">CommandLineHandler.ExecuteScriptCommand</span></a></li>
 <li type="circle">client.commandline.<a href="../../client/commandline/CommandLineHandler.ExitCommand.html" title="class in client.commandline"><span class="typeNameLink">CommandLineHandler.ExitCommand</span></a></li>
 <li type="circle">client.commandline.<a href="../../client/commandline/CommandLineHandler.HistoryCommand.html" title="class in client.commandline"><span class="typeNameLink">CommandLineHandler.HistoryCommand</span></a></li>
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddCommand.html
index 0679d74..275e285 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>AddCommand (Lab5Client 2.0 API)</title>
+<title>AddCommand (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AddCommand (Lab5Client 2.0 API)";
+            parent.document.title="AddCommand (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddIfMaxCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddIfMaxCommand.html
index 84f3970..584790e 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddIfMaxCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddIfMaxCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>AddIfMaxCommand (Lab5Client 2.0 API)</title>
+<title>AddIfMaxCommand (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AddIfMaxCommand (Lab5Client 2.0 API)";
+            parent.document.title="AddIfMaxCommand (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddIfMinCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddIfMinCommand.html
index 284a50e..34e63f7 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddIfMinCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddIfMinCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>AddIfMinCommand (Lab5Client 2.0 API)</title>
+<title>AddIfMinCommand (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AddIfMinCommand (Lab5Client 2.0 API)";
+            parent.document.title="AddIfMinCommand (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/ClearCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/ClearCommand.html
index 4eab2f1..b813e6d 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/ClearCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/ClearCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>ClearCommand (Lab5Client 2.0 API)</title>
+<title>ClearCommand (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ClearCommand (Lab5Client 2.0 API)";
+            parent.document.title="ClearCommand (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/FilterContainsNameCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/FilterContainsNameCommand.html
index 1bbccb7..34a2f29 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/FilterContainsNameCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/FilterContainsNameCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>FilterContainsNameCommand (Lab5Client 2.0 API)</title>
+<title>FilterContainsNameCommand (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="FilterContainsNameCommand (Lab5Client 2.0 API)";
+            parent.document.title="FilterContainsNameCommand (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/InfoCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/InfoCommand.html
index 05c9d78..be1f341 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/InfoCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/InfoCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>InfoCommand (Lab5Client 2.0 API)</title>
+<title>InfoCommand (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InfoCommand (Lab5Client 2.0 API)";
+            parent.document.title="InfoCommand (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/PeopleDatabaseCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/PeopleDatabaseCommand.html
index 6783e09..947eaa3 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/PeopleDatabaseCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/PeopleDatabaseCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>PeopleDatabaseCommand (Lab5Client 2.0 API)</title>
+<title>PeopleDatabaseCommand (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="PeopleDatabaseCommand (Lab5Client 2.0 API)";
+            parent.document.title="PeopleDatabaseCommand (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/PeopleDatabaseCommands.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/PeopleDatabaseCommands.html
index 102f392..f87f22c 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/PeopleDatabaseCommands.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/PeopleDatabaseCommands.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>PeopleDatabaseCommands (Lab5Client 2.0 API)</title>
+<title>PeopleDatabaseCommands (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="PeopleDatabaseCommands (Lab5Client 2.0 API)";
+            parent.document.title="PeopleDatabaseCommands (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/PrintFieldDescendingLocationCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/PrintFieldDescendingLocationCommand.html
index 8a4f121..21047cd 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/PrintFieldDescendingLocationCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/PrintFieldDescendingLocationCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>PrintFieldDescendingLocationCommand (Lab5Client 2.0 API)</title>
+<title>PrintFieldDescendingLocationCommand (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="PrintFieldDescendingLocationCommand (Lab5Client 2.0 API)";
+            parent.document.title="PrintFieldDescendingLocationCommand (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/RemoveByIdCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/RemoveByIdCommand.html
index ab50ad1..e15c749 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/RemoveByIdCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/RemoveByIdCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>RemoveByIdCommand (Lab5Client 2.0 API)</title>
+<title>RemoveByIdCommand (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="RemoveByIdCommand (Lab5Client 2.0 API)";
+            parent.document.title="RemoveByIdCommand (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/SaveCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/SaveCommand.html
index 4e266bc..7e072eb 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/SaveCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/SaveCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>SaveCommand (Lab5Client 2.0 API)</title>
+<title>SaveCommand (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SaveCommand (Lab5Client 2.0 API)";
+            parent.document.title="SaveCommand (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/ShowCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/ShowCommand.html
index 5bda0a4..63bfd5d 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/ShowCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/ShowCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>ShowCommand (Lab5Client 2.0 API)</title>
+<title>ShowCommand (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ShowCommand (Lab5Client 2.0 API)";
+            parent.document.title="ShowCommand (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/SumOfHeightCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/SumOfHeightCommand.html
index 22d7d5f..faedc32 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/SumOfHeightCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/SumOfHeightCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>SumOfHeightCommand (Lab5Client 2.0 API)</title>
+<title>SumOfHeightCommand (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SumOfHeightCommand (Lab5Client 2.0 API)";
+            parent.document.title="SumOfHeightCommand (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/UpdateCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/UpdateCommand.html
index b9c6080..b909534 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/UpdateCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/UpdateCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>UpdateCommand (Lab5Client 2.0 API)</title>
+<title>UpdateCommand (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="UpdateCommand (Lab5Client 2.0 API)";
+            parent.document.title="UpdateCommand (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-frame.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-frame.html
index 6495b51..a5ddd43 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-frame.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client.commandline.pdcommands (Lab5Client 2.0 API)</title>
+<title>client.commandline.pdcommands (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-summary.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-summary.html
index 2a9d2bf..d63ad58 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-summary.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client.commandline.pdcommands (Lab5Client 2.0 API)</title>
+<title>client.commandline.pdcommands (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="client.commandline.pdcommands (Lab5Client 2.0 API)";
+            parent.document.title="client.commandline.pdcommands (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-tree.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-tree.html
index 789e15b..88bacc8 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-tree.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client.commandline.pdcommands Class Hierarchy (Lab5Client 2.0 API)</title>
+<title>client.commandline.pdcommands Class Hierarchy (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="client.commandline.pdcommands Class Hierarchy (Lab5Client 2.0 API)";
+            parent.document.title="client.commandline.pdcommands Class Hierarchy (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/net/UDPClient.html b/Lab5Client/build/docs/javadoc/client/net/UDPClient.html
index 1fc25fe..3b27546 100644
--- a/Lab5Client/build/docs/javadoc/client/net/UDPClient.html
+++ b/Lab5Client/build/docs/javadoc/client/net/UDPClient.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>UDPClient (Lab5Client 2.0 API)</title>
+<title>UDPClient (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,13 +11,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="UDPClient (Lab5Client 2.0 API)";
+            parent.document.title="UDPClient (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -157,14 +157,26 @@ extends java.lang.Object</pre>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../client/net/UDPClient.html#disconnect--">disconnect</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code>common.commandline.response.CommandResult</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../client/net/UDPClient.html#receive--">receive</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../client/net/UDPClient.html#isAvailable--">isAvailable</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>common.commandline.response.CommandResult</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../client/net/UDPClient.html#receive--">receive</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>common.commandline.response.CommandResult</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../client/net/UDPClient.html#send-common.commandline.Executable-java.lang.Object:A-">send</a></span>(common.commandline.Executable&nbsp;executable,
     java.lang.Object[]&nbsp;args)</code>&nbsp;</td>
 </tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../client/net/UDPClient.html#setHostname-java.lang.String-">setHostname</a></span>(java.lang.String&nbsp;hostname)</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../client/net/UDPClient.html#setPort-int-">setPort</a></span>(int&nbsp;port)</code>&nbsp;</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -245,12 +257,39 @@ extends java.lang.Object</pre>
 <a name="receive--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>receive</h4>
 <pre>public&nbsp;common.commandline.response.CommandResult&nbsp;receive()</pre>
 </li>
 </ul>
+<a name="setHostname-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setHostname</h4>
+<pre>public&nbsp;void&nbsp;setHostname(java.lang.String&nbsp;hostname)</pre>
+</li>
+</ul>
+<a name="setPort-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPort</h4>
+<pre>public&nbsp;void&nbsp;setPort(int&nbsp;port)</pre>
+</li>
+</ul>
+<a name="isAvailable--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>isAvailable</h4>
+<pre>public&nbsp;boolean&nbsp;isAvailable()</pre>
+</li>
+</ul>
 </li>
 </ul>
 </li>
diff --git a/Lab5Client/build/docs/javadoc/client/net/package-frame.html b/Lab5Client/build/docs/javadoc/client/net/package-frame.html
index c388a1b..98560b2 100644
--- a/Lab5Client/build/docs/javadoc/client/net/package-frame.html
+++ b/Lab5Client/build/docs/javadoc/client/net/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client.net (Lab5Client 2.0 API)</title>
+<title>client.net (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
diff --git a/Lab5Client/build/docs/javadoc/client/net/package-summary.html b/Lab5Client/build/docs/javadoc/client/net/package-summary.html
index d88c824..4e90726 100644
--- a/Lab5Client/build/docs/javadoc/client/net/package-summary.html
+++ b/Lab5Client/build/docs/javadoc/client/net/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client.net (Lab5Client 2.0 API)</title>
+<title>client.net (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="client.net (Lab5Client 2.0 API)";
+            parent.document.title="client.net (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/net/package-tree.html b/Lab5Client/build/docs/javadoc/client/net/package-tree.html
index ac95358..c290627 100644
--- a/Lab5Client/build/docs/javadoc/client/net/package-tree.html
+++ b/Lab5Client/build/docs/javadoc/client/net/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client.net Class Hierarchy (Lab5Client 2.0 API)</title>
+<title>client.net Class Hierarchy (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="client.net Class Hierarchy (Lab5Client 2.0 API)";
+            parent.document.title="client.net Class Hierarchy (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/package-frame.html b/Lab5Client/build/docs/javadoc/client/package-frame.html
index 1e282b5..cb9d45e 100644
--- a/Lab5Client/build/docs/javadoc/client/package-frame.html
+++ b/Lab5Client/build/docs/javadoc/client/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client (Lab5Client 2.0 API)</title>
+<title>client (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/Lab5Client/build/docs/javadoc/client/package-summary.html b/Lab5Client/build/docs/javadoc/client/package-summary.html
index 2122eb6..6bbe43a 100644
--- a/Lab5Client/build/docs/javadoc/client/package-summary.html
+++ b/Lab5Client/build/docs/javadoc/client/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client (Lab5Client 2.0 API)</title>
+<title>client (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="client (Lab5Client 2.0 API)";
+            parent.document.title="client (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/package-tree.html b/Lab5Client/build/docs/javadoc/client/package-tree.html
index 5ccbe49..344ed0a 100644
--- a/Lab5Client/build/docs/javadoc/client/package-tree.html
+++ b/Lab5Client/build/docs/javadoc/client/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client Class Hierarchy (Lab5Client 2.0 API)</title>
+<title>client Class Hierarchy (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="client Class Hierarchy (Lab5Client 2.0 API)";
+            parent.document.title="client Class Hierarchy (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/constant-values.html b/Lab5Client/build/docs/javadoc/constant-values.html
index fc0d8c4..1d5d576 100644
--- a/Lab5Client/build/docs/javadoc/constant-values.html
+++ b/Lab5Client/build/docs/javadoc/constant-values.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Constant Field Values (Lab5Client 2.0 API)</title>
+<title>Constant Field Values (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (Lab5Client 2.0 API)";
+            parent.document.title="Constant Field Values (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/deprecated-list.html b/Lab5Client/build/docs/javadoc/deprecated-list.html
index 600fef5..39c9c47 100644
--- a/Lab5Client/build/docs/javadoc/deprecated-list.html
+++ b/Lab5Client/build/docs/javadoc/deprecated-list.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Deprecated List (Lab5Client 2.0 API)</title>
+<title>Deprecated List (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List (Lab5Client 2.0 API)";
+            parent.document.title="Deprecated List (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/help-doc.html b/Lab5Client/build/docs/javadoc/help-doc.html
index ce285e5..6d41880 100644
--- a/Lab5Client/build/docs/javadoc/help-doc.html
+++ b/Lab5Client/build/docs/javadoc/help-doc.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>API Help (Lab5Client 2.0 API)</title>
+<title>API Help (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help (Lab5Client 2.0 API)";
+            parent.document.title="API Help (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/index-all.html b/Lab5Client/build/docs/javadoc/index-all.html
index e5800dc..405aa89 100644
--- a/Lab5Client/build/docs/javadoc/index-all.html
+++ b/Lab5Client/build/docs/javadoc/index-all.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Index (Lab5Client 2.0 API)</title>
+<title>Index (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Index (Lab5Client 2.0 API)";
+            parent.document.title="Index (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
@@ -139,6 +139,8 @@
  читает ввод с командной строки, обрабатывает его и вызывает соответствующую команду
  на выполнение из регистра команд, используйте метод <a href="client/commandline/CommandLineHandler.html#start--"><code>CommandLineHandler.start()</code></a> для его запуска</div>
 </dd>
+<dt><a href="client/commandline/CommandLineHandler.ConnectionCommand.html" title="class in client.commandline"><span class="typeNameLink">CommandLineHandler.ConnectionCommand</span></a> - Class in <a href="client/commandline/package-summary.html">client.commandline</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="client/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in client.commandline"><span class="typeNameLink">CommandLineHandler.ExecuteScriptCommand</span></a> - Class in <a href="client/commandline/package-summary.html">client.commandline</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="client/commandline/CommandLineHandler.ExitCommand.html" title="class in client.commandline"><span class="typeNameLink">CommandLineHandler.ExitCommand</span></a> - Class in <a href="client/commandline/package-summary.html">client.commandline</a></dt>
@@ -159,6 +161,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="client/net/UDPClient.html#connect--">connect()</a></span> - Method in class client.net.<a href="client/net/UDPClient.html" title="class in client.net">UDPClient</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="client/commandline/CommandLineHandler.ConnectionCommand.html#ConnectionCommand--">ConnectionCommand()</a></span> - Constructor for class client.commandline.<a href="client/commandline/CommandLineHandler.ConnectionCommand.html" title="class in client.commandline">CommandLineHandler.ConnectionCommand</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="client/commandline/pdcommands/PeopleDatabaseCommands.html#createCoordinates--">createCoordinates()</a></span> - Static method in class client.commandline.pdcommands.<a href="client/commandline/pdcommands/PeopleDatabaseCommands.html" title="class in client.commandline.pdcommands">PeopleDatabaseCommands</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="client/commandline/pdcommands/PeopleDatabaseCommands.html#createLocation--">createLocation()</a></span> - Static method in class client.commandline.pdcommands.<a href="client/commandline/pdcommands/PeopleDatabaseCommands.html" title="class in client.commandline.pdcommands">PeopleDatabaseCommands</a></dt>
@@ -235,6 +239,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="client/commandline/pdcommands/InfoCommand.html#InfoCommand--">InfoCommand()</a></span> - Constructor for class client.commandline.pdcommands.<a href="client/commandline/pdcommands/InfoCommand.html" title="class in client.commandline.pdcommands">InfoCommand</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="client/net/UDPClient.html#isAvailable--">isAvailable()</a></span> - Method in class client.net.<a href="client/net/UDPClient.html" title="class in client.net">UDPClient</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <a name="I:L">
 <!--   -->
@@ -314,6 +320,10 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="client/net/UDPClient.html#send-common.commandline.Executable-java.lang.Object:A-">send(Executable, Object[])</a></span> - Method in class client.net.<a href="client/net/UDPClient.html" title="class in client.net">UDPClient</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="client/net/UDPClient.html#setHostname-java.lang.String-">setHostname(String)</a></span> - Method in class client.net.<a href="client/net/UDPClient.html" title="class in client.net">UDPClient</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="client/net/UDPClient.html#setPort-int-">setPort(int)</a></span> - Method in class client.net.<a href="client/net/UDPClient.html" title="class in client.net">UDPClient</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="client/commandline/pdcommands/ShowCommand.html" title="class in client.commandline.pdcommands"><span class="typeNameLink">ShowCommand</span></a> - Class in <a href="client/commandline/pdcommands/package-summary.html">client.commandline.pdcommands</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="client/commandline/pdcommands/ShowCommand.html#ShowCommand--">ShowCommand()</a></span> - Constructor for class client.commandline.pdcommands.<a href="client/commandline/pdcommands/ShowCommand.html" title="class in client.commandline.pdcommands">ShowCommand</a></dt>
@@ -352,6 +362,8 @@
 <dl>
 <dt><span class="memberNameLink"><a href="client/commandline/Command.html#validate-java.lang.String:A-">validate(String[])</a></span> - Method in class client.commandline.<a href="client/commandline/Command.html" title="class in client.commandline">Command</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="client/commandline/CommandLineHandler.ConnectionCommand.html#validate-java.lang.String:A-">validate(String[])</a></span> - Method in class client.commandline.<a href="client/commandline/CommandLineHandler.ConnectionCommand.html" title="class in client.commandline">CommandLineHandler.ConnectionCommand</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="client/commandline/CommandLineHandler.ExecuteScriptCommand.html#validate-java.lang.String:A-">validate(String[])</a></span> - Method in class client.commandline.<a href="client/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in client.commandline">CommandLineHandler.ExecuteScriptCommand</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="client/commandline/CommandLineHandler.ExitCommand.html#validate-java.lang.String:A-">validate(String[])</a></span> - Method in class client.commandline.<a href="client/commandline/CommandLineHandler.ExitCommand.html" title="class in client.commandline">CommandLineHandler.ExitCommand</a></dt>
diff --git a/Lab5Client/build/docs/javadoc/index.html b/Lab5Client/build/docs/javadoc/index.html
index 3cf7b43..e12004a 100644
--- a/Lab5Client/build/docs/javadoc/index.html
+++ b/Lab5Client/build/docs/javadoc/index.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Lab5Client 2.0 API</title>
+<title>Lab5Client 2.1 API</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
     if (tmpTargetPage != "" && tmpTargetPage != "undefined")
diff --git a/Lab5Client/build/docs/javadoc/overview-frame.html b/Lab5Client/build/docs/javadoc/overview-frame.html
index 0f2a67d..2382f14 100644
--- a/Lab5Client/build/docs/javadoc/overview-frame.html
+++ b/Lab5Client/build/docs/javadoc/overview-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Overview List (Lab5Client 2.0 API)</title>
+<title>Overview List (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/Lab5Client/build/docs/javadoc/overview-summary.html b/Lab5Client/build/docs/javadoc/overview-summary.html
index d751211..bb7d998 100644
--- a/Lab5Client/build/docs/javadoc/overview-summary.html
+++ b/Lab5Client/build/docs/javadoc/overview-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Overview (Lab5Client 2.0 API)</title>
+<title>Overview (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Overview (Lab5Client 2.0 API)";
+            parent.document.title="Overview (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
@@ -68,7 +68,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title">Lab5Client 2.0 API</h1>
+<h1 class="title">Lab5Client 2.1 API</h1>
 </div>
 <div class="contentContainer">
 <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Packages table, listing packages, and an explanation">
diff --git a/Lab5Client/build/docs/javadoc/overview-tree.html b/Lab5Client/build/docs/javadoc/overview-tree.html
index 7e6f35b..f9f35aa 100644
--- a/Lab5Client/build/docs/javadoc/overview-tree.html
+++ b/Lab5Client/build/docs/javadoc/overview-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Class Hierarchy (Lab5Client 2.0 API)</title>
+<title>Class Hierarchy (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Class Hierarchy (Lab5Client 2.0 API)";
+            parent.document.title="Class Hierarchy (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
@@ -84,6 +84,7 @@
 <ul>
 <li type="circle">client.commandline.<a href="client/commandline/Command.html" title="class in client.commandline"><span class="typeNameLink">Command</span></a> (implements java.io.Serializable)
 <ul>
+<li type="circle">client.commandline.<a href="client/commandline/CommandLineHandler.ConnectionCommand.html" title="class in client.commandline"><span class="typeNameLink">CommandLineHandler.ConnectionCommand</span></a></li>
 <li type="circle">client.commandline.<a href="client/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in client.commandline"><span class="typeNameLink">CommandLineHandler.ExecuteScriptCommand</span></a></li>
 <li type="circle">client.commandline.<a href="client/commandline/CommandLineHandler.ExitCommand.html" title="class in client.commandline"><span class="typeNameLink">CommandLineHandler.ExitCommand</span></a></li>
 <li type="circle">client.commandline.<a href="client/commandline/CommandLineHandler.HistoryCommand.html" title="class in client.commandline"><span class="typeNameLink">CommandLineHandler.HistoryCommand</span></a></li>
diff --git a/Lab5Client/build/docs/javadoc/serialized-form.html b/Lab5Client/build/docs/javadoc/serialized-form.html
index d7c8260..855336e 100644
--- a/Lab5Client/build/docs/javadoc/serialized-form.html
+++ b/Lab5Client/build/docs/javadoc/serialized-form.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Serialized Form (Lab5Client 2.0 API)</title>
+<title>Serialized Form (Lab5Client 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Serialized Form (Lab5Client 2.0 API)";
+            parent.document.title="Serialized Form (Lab5Client 2.1 API)";
         }
     }
     catch(err) {
@@ -107,6 +107,11 @@
 </li>
 </ul>
 </li>
+<li class="blockList"><a name="client.commandline.CommandLineHandler.ConnectionCommand">
+<!--   -->
+</a>
+<h3>Class <a href="client/commandline/CommandLineHandler.ConnectionCommand.html" title="class in client.commandline">client.commandline.CommandLineHandler.ConnectionCommand</a> extends <a href="client/commandline/Command.html" title="class in client.commandline">Command</a> implements Serializable</h3>
+</li>
 <li class="blockList"><a name="client.commandline.CommandLineHandler.ExecuteScriptCommand">
 <!--   -->
 </a>
diff --git a/Lab5Client/build/libs/Lab5Client-2.0.jar b/Lab5Client/build/libs/Lab5Client-2.0.jar
deleted file mode 100644
index 06ad261..0000000
Binary files a/Lab5Client/build/libs/Lab5Client-2.0.jar and /dev/null differ
diff --git a/Lab5Client/build/libs/connection.properties b/Lab5Client/build/libs/connection.properties
index f5630d4..bfee96e 100644
--- a/Lab5Client/build/libs/connection.properties
+++ b/Lab5Client/build/libs/connection.properties
@@ -1,2 +1,4 @@
+#Changed by user
+#Tue May 10 22:01:33 MSK 2022
 hostname=localhost
-port=1234
\ No newline at end of file
+port=3232
diff --git a/Lab5Client/build/libs/connection.properties.bak b/Lab5Client/build/libs/connection.properties.bak
index 168e0c6..f5630d4 100644
--- a/Lab5Client/build/libs/connection.properties.bak
+++ b/Lab5Client/build/libs/connection.properties.bak
@@ -1,2 +1,2 @@
 hostname=localhost
-port=2222
\ No newline at end of file
+port=1234
\ No newline at end of file
diff --git a/Lab5Client/build/tmp/compileJava/previous-compilation-data.bin b/Lab5Client/build/tmp/compileJava/previous-compilation-data.bin
index bbecc71..17eca42 100644
Binary files a/Lab5Client/build/tmp/compileJava/previous-compilation-data.bin and b/Lab5Client/build/tmp/compileJava/previous-compilation-data.bin differ
diff --git a/Lab5Client/build/tmp/javadoc/javadoc.options b/Lab5Client/build/tmp/javadoc/javadoc.options
index 183e73d..be0ced2 100644
--- a/Lab5Client/build/tmp/javadoc/javadoc.options
+++ b/Lab5Client/build/tmp/javadoc/javadoc.options
@@ -1,10 +1,10 @@
--classpath 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Client\\build\\classes\\java\\main;C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Client\\build\\resources\\main;C:\\Users\\egor\\.gradle\\caches\\modules-2\\files-2.1\\org.projectlombok\\lombok\\1.18.22\\9c08ea24c6eb714e2d6170e8122c069a0ba9aacf\\lombok-1.18.22.jar;C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\build\\libs\\Lab5Core-2.0.jar'
+-classpath 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Client\\build\\classes\\java\\main;C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Client\\build\\resources\\main;C:\\Users\\egor\\.gradle\\caches\\modules-2\\files-2.1\\org.projectlombok\\lombok\\1.18.22\\9c08ea24c6eb714e2d6170e8122c069a0ba9aacf\\lombok-1.18.22.jar;C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\build\\libs\\Lab5Core-2.1.jar'
 -d 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Client\\build\\docs\\javadoc'
--doctitle 'Lab5Client 2.0 API'
+-doctitle 'Lab5Client 2.1 API'
 -encoding 'UTF-8'
 -notimestamp 
 -quiet 
--windowtitle 'Lab5Client 2.0 API'
+-windowtitle 'Lab5Client 2.1 API'
 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Client\\src\\main\\java\\client\\commandline\\Command.java'
 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Client\\src\\main\\java\\client\\commandline\\CommandLineHandler.java'
 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Client\\src\\main\\java\\client\\commandline\\CommandRegistry.java'
diff --git a/Lab5Client/src/main/java/client/commandline/CommandLineHandler.java b/Lab5Client/src/main/java/client/commandline/CommandLineHandler.java
index 88bf7ee..781bc0a 100644
--- a/Lab5Client/src/main/java/client/commandline/CommandLineHandler.java
+++ b/Lab5Client/src/main/java/client/commandline/CommandLineHandler.java
@@ -1,7 +1,6 @@
 package client.commandline;
 
 import client.net.UDPClient;
-import common.commandline.Executables;
 import common.commandline.response.CommandResult;
 import common.commandline.response.DefaultResponse;
 import common.commandline.response.Response;
@@ -47,7 +46,7 @@ public final class CommandLineHandler {
     }
 
     private static void registerBasicCommands() {
-        CommandRegistry.registerCommands(new ExitCommand(), new HistoryCommand(), new ExecuteScriptCommand(), new ModeCommand());
+        CommandRegistry.registerCommands(new ExitCommand(), new HistoryCommand(), new ExecuteScriptCommand(), new ModeCommand(), new ConnectionCommand());
     }
 
     /**
@@ -281,13 +280,18 @@ public final class CommandLineHandler {
                         if (args.length == 0) {
                             result = "Программа работает в режиме клиент " + (instance.clientMode ? "" : "+ сервер");
                         } else {
-                            instance.clientMode = !instance.clientMode;
                             if (instance.clientMode) {
-                                result = "Режим работы сменен на клиент";
-                                instance.udp.disconnect();
-                            } else {
                                 result = "Режим работы сменен на клиент + сервер";
                                 instance.udp.connect();
+                                if (!instance.udp.isAvailable()) {
+                                    instance.udp.disconnect();
+                                    instance.clientMode = true;
+                                    return new CommandResult("Не удалось установить соединение с сервером", DefaultResponse.SERVER_ERROR);
+                                } else instance.clientMode = false;
+                            } else {
+                                result = "Режим работы сменен на клиент";
+                                instance.udp.disconnect();
+                                instance.clientMode = true;
                             }
                         }
                         return new CommandResult(result, DefaultResponse.OK);
@@ -301,4 +305,64 @@ public final class CommandLineHandler {
             return true;
         }
     }
+
+    public static class ConnectionCommand extends Command {
+        public ConnectionCommand() {
+            super("con", true, "con [host|port] [value] : выводит информацию о сохраненных данных соединения с сервером, можно менять адрес или порт написав host или port и после них соответствующее значение",
+                    args -> {
+                        String result;
+                        if (args.length == 0) {
+                            result = String.format("Информация о соединении:\n\tАдрес - %s\n\tПорт - %d",
+                                    ConnectionProperties.getHostname(), ConnectionProperties.getPort());
+                            return new CommandResult(result, DefaultResponse.OK);
+                        } else {
+                            String change = (String) args[0];
+                            if (change.equals("host")) {
+                                String host = (String) args[1];
+                                ConnectionProperties.setHostname(host);
+                                instance.udp.setHostname(host);
+                                instance.udp.disconnect();
+                                instance.udp.connect();
+                                Response response = DefaultResponse.OK;
+                                return new CommandResult(response.getMsg(), response);
+                            } else {
+                                int port = (Integer) args[1];
+                                ConnectionProperties.setPort(port);
+                                instance.udp.setPort(port);
+                                instance.udp.disconnect();
+                                instance.udp.connect();
+                                Response response = DefaultResponse.OK;
+                                return new CommandResult(response.getMsg(), response);
+                            }
+                        }
+                    });
+        }
+
+        @Override
+        public boolean validate(String[] args) {
+            if (args.length == 0){
+                this.args = new Object[]{};
+                return true;
+            }
+            if (args.length < 2) {
+                System.err.println("Недостаточно аргументов");
+                return false;
+            }
+            String change = args[0].toLowerCase(Locale.ROOT);
+            if (change.equals("host")) {
+                this.args = new Object[]{ change, args[1] };
+                return true;
+            } else if (change.equals("port")) {
+                Integer port = UtilFunctions.intOrNull(args[1]);
+                if (port == null || port < 0 || port > 65535) {
+                    System.err.println("Порт должен быть целым числом от 0 до 65535");
+                    return false;
+                }
+                this.args = new Object[]{ change, port };
+                return true;
+            }
+            System.err.println("Неизвестное свойство " + args[0]);
+            return false;
+        }
+    }
 }
diff --git a/Lab5Client/src/main/java/client/net/UDPClient.java b/Lab5Client/src/main/java/client/net/UDPClient.java
index a71271d..5e66829 100644
--- a/Lab5Client/src/main/java/client/net/UDPClient.java
+++ b/Lab5Client/src/main/java/client/net/UDPClient.java
@@ -3,17 +3,24 @@ package client.net;
 import common.commandline.Executable;
 import common.commandline.response.CommandResult;
 import common.commandline.response.DefaultResponse;
+import common.commandline.response.Response;
 
 import java.io.*;
 import java.net.*;
+import java.nio.ByteBuffer;
+import java.nio.channels.DatagramChannel;
 
 public class UDPClient {
 
     private String hostname;
-    private final int port;
-    private InetAddress address;
-    private DatagramSocket socket;
-    boolean available = false;
+    private int port;
+    private InetSocketAddress address;
+    private DatagramChannel datagramChannel;
+    private boolean isAvailable = false;
+    private final static String LOCALHOST = "localhost";
+    private final static int    BUFFER_SIZE = 65_535,
+                                TIMES_TO_TRY_READ = 10,
+                                READ_ATTEMPT_DELAY_MS = 500;
 
     public UDPClient(int port) {
         this.port = port;
@@ -26,32 +33,44 @@ public class UDPClient {
 
     public void connect() {
         try {
-            address = hostname == null ? InetAddress.getLocalHost() : InetAddress.getByName(hostname);
-            socket = new DatagramSocket();
-            socket.setSoTimeout(10000);
-            available = true;
-        } catch (UnknownHostException | SocketException e) {
-            System.err.println("Ошибка при подключении к серверу, хост не найден");
-            available = false;
+            if (hostname == null) hostname = LOCALHOST;
+            datagramChannel = DatagramChannel.open();
+            address = new InetSocketAddress(hostname, port);
+            datagramChannel.bind(new InetSocketAddress(0));
+            datagramChannel.configureBlocking(false);
+            if (address.isUnresolved()) {
+                System.err.println("Адреса " + hostname + " не существует, укажите другой адрес");
+                return;
+            }
+        } catch (SocketException e) {
+            System.err.println("Указанный порт подключения занят, укажите другой порт");
+        } catch (IOException e) {
+            System.err.println("Что-то пошло не так при соединении с сервером");
         }
+        isAvailable = true;
     }
 
     public void disconnect() {
-        if (!available) return;
-        socket.close();
-        available = false;
+        if (!isAvailable) return;
+        try {
+            datagramChannel.close();
+        } catch (IOException e) {
+            System.err.println("Что-то пошло не так во время разрыва соединения с сервером");
+        }
+        isAvailable = false;
     }
 
     public CommandResult send(Executable executable, Object[] args) {
-        if (!available) return new CommandResult(null, DefaultResponse.HOST_NOT_FOUND);
-        byte[] buffer;
-        try (ByteArrayOutputStream byteOutputStream = new ByteArrayOutputStream()) {
+        if (!isAvailable) {
+            Response response = DefaultResponse.HOST_NOT_FOUND;
+            return new CommandResult(response.getMsg(), response);
+        }
+        try (ByteArrayOutputStream byteOutputStream = new ByteArrayOutputStream(BUFFER_SIZE)) {
             ObjectOutputStream objectOutputStream = new ObjectOutputStream(byteOutputStream);
             objectOutputStream.writeObject(executable);
             objectOutputStream.writeObject(args);
-            buffer = byteOutputStream.toByteArray();
-            DatagramPacket request = new DatagramPacket(buffer, buffer.length, address, port);
-            socket.send(request);
+            ByteBuffer buffer = ByteBuffer.wrap(byteOutputStream.toByteArray());
+            datagramChannel.send(buffer, address);
         } catch (IOException e) {
             return new CommandResult("Нет ответа от сервера", DefaultResponse.SERVER_ERROR);
         }
@@ -59,22 +78,47 @@ public class UDPClient {
     }
 
     public CommandResult receive() {
-        byte[] buffer = new byte[65535];
-        DatagramPacket response = new DatagramPacket(buffer, buffer.length);
-        try (ByteArrayInputStream byteInputStream = new ByteArrayInputStream(buffer)) {
-            socket.receive(response);
+        ByteBuffer buffer = ByteBuffer.allocate(BUFFER_SIZE);
+        boolean dataReceived = false;
+        try {
+            for (int i = 0; i < TIMES_TO_TRY_READ; i++) {
+                if (datagramChannel.receive(buffer) != null) {
+                    dataReceived = true;
+                    break;
+                }
+                Thread.sleep(READ_ATTEMPT_DELAY_MS);
+            }
+        } catch (IOException e) {
+            return new CommandResult("Нестабильное соединение", DefaultResponse.SERVER_ERROR);
+        } catch (InterruptedException e) {
+            return new CommandResult("Получение данных было прервано", DefaultResponse.UNKNOWN);
+        }
+        if (!dataReceived)
+            return new CommandResult("Сервер не отвечает", DefaultResponse.SERVER_ERROR);
+        try (ByteArrayInputStream byteInputStream = new ByteArrayInputStream(buffer.array())) {
             ObjectInputStream objectInputStream = new ObjectInputStream(byteInputStream);
             CommandResult result = (CommandResult) objectInputStream.readObject();
             objectInputStream.close();
             return result;
-        } catch (SocketTimeoutException e) {
-            return new CommandResult("Сервер не отвечает", DefaultResponse.SERVER_ERROR);
         } catch (IOException e) {
-            return new CommandResult("Нестабильное соединении", DefaultResponse.SERVER_ERROR);
+            return new CommandResult("Данные были повреждены", DefaultResponse.SERVER_ERROR);
         } catch (ClassNotFoundException e) {
             return new CommandResult("Не удалось преобразовать результат, не существует нужного класса", DefaultResponse.CLASS_NOT_FOUND);
         } catch (ClassCastException e) {
+            e.printStackTrace();
             return new CommandResult("Не удалось преобразовать результат, ожидался объект другого типа", DefaultResponse.TYPE_ERROR);
         }
     }
+
+    public void setHostname(String hostname) {
+        this.hostname = hostname;
+    }
+
+    public void setPort(int port) {
+        this.port = port;
+    }
+
+    public boolean isAvailable() {
+        return isAvailable;
+    }
 }
diff --git a/Lab5Core/build.gradle.kts b/Lab5Core/build.gradle.kts
index 2b5be4e..3703624 100644
--- a/Lab5Core/build.gradle.kts
+++ b/Lab5Core/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 group = "ru.erius.lab5"
-version = "2.0"
+version = "2.1"
 
 repositories {
     mavenCentral()
diff --git a/Lab5Core/build/classes/java/main/common/commandline/Executables.class b/Lab5Core/build/classes/java/main/common/commandline/Executables.class
index 56c3fca..4f3b639 100644
Binary files a/Lab5Core/build/classes/java/main/common/commandline/Executables.class and b/Lab5Core/build/classes/java/main/common/commandline/Executables.class differ
diff --git a/Lab5Core/build/docs/javadoc/allclasses-frame.html b/Lab5Core/build/docs/javadoc/allclasses-frame.html
index 03d1708..4c3fa38 100644
--- a/Lab5Core/build/docs/javadoc/allclasses-frame.html
+++ b/Lab5Core/build/docs/javadoc/allclasses-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (Lab5Core 2.0 API)</title>
+<title>All Classes (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/Lab5Core/build/docs/javadoc/allclasses-noframe.html b/Lab5Core/build/docs/javadoc/allclasses-noframe.html
index 216ac53..44d07be 100644
--- a/Lab5Core/build/docs/javadoc/allclasses-noframe.html
+++ b/Lab5Core/build/docs/javadoc/allclasses-noframe.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (Lab5Core 2.0 API)</title>
+<title>All Classes (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/Lab5Core/build/docs/javadoc/common/collection/Database.DatabaseLoadFailedException.html b/Lab5Core/build/docs/javadoc/common/collection/Database.DatabaseLoadFailedException.html
index e962f5b..bcce741 100644
--- a/Lab5Core/build/docs/javadoc/common/collection/Database.DatabaseLoadFailedException.html
+++ b/Lab5Core/build/docs/javadoc/common/collection/Database.DatabaseLoadFailedException.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Database.DatabaseLoadFailedException (Lab5Core 2.0 API)</title>
+<title>Database.DatabaseLoadFailedException (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Database.DatabaseLoadFailedException (Lab5Core 2.0 API)";
+            parent.document.title="Database.DatabaseLoadFailedException (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/collection/Database.DatabaseSaveFailedException.html b/Lab5Core/build/docs/javadoc/common/collection/Database.DatabaseSaveFailedException.html
index f52abaf..aca417b 100644
--- a/Lab5Core/build/docs/javadoc/common/collection/Database.DatabaseSaveFailedException.html
+++ b/Lab5Core/build/docs/javadoc/common/collection/Database.DatabaseSaveFailedException.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Database.DatabaseSaveFailedException (Lab5Core 2.0 API)</title>
+<title>Database.DatabaseSaveFailedException (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Database.DatabaseSaveFailedException (Lab5Core 2.0 API)";
+            parent.document.title="Database.DatabaseSaveFailedException (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/collection/Database.html b/Lab5Core/build/docs/javadoc/common/collection/Database.html
index 3fece58..e74dae3 100644
--- a/Lab5Core/build/docs/javadoc/common/collection/Database.html
+++ b/Lab5Core/build/docs/javadoc/common/collection/Database.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Database (Lab5Core 2.0 API)</title>
+<title>Database (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Database (Lab5Core 2.0 API)";
+            parent.document.title="Database (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/collection/PeopleDatabase.html b/Lab5Core/build/docs/javadoc/common/collection/PeopleDatabase.html
index 8e53de7..f011591 100644
--- a/Lab5Core/build/docs/javadoc/common/collection/PeopleDatabase.html
+++ b/Lab5Core/build/docs/javadoc/common/collection/PeopleDatabase.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>PeopleDatabase (Lab5Core 2.0 API)</title>
+<title>PeopleDatabase (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="PeopleDatabase (Lab5Core 2.0 API)";
+            parent.document.title="PeopleDatabase (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/collection/package-frame.html b/Lab5Core/build/docs/javadoc/common/collection/package-frame.html
index 6eb7126..b8b89a4 100644
--- a/Lab5Core/build/docs/javadoc/common/collection/package-frame.html
+++ b/Lab5Core/build/docs/javadoc/common/collection/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.collection (Lab5Core 2.0 API)</title>
+<title>common.collection (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
diff --git a/Lab5Core/build/docs/javadoc/common/collection/package-summary.html b/Lab5Core/build/docs/javadoc/common/collection/package-summary.html
index b7745b7..b6f2674 100644
--- a/Lab5Core/build/docs/javadoc/common/collection/package-summary.html
+++ b/Lab5Core/build/docs/javadoc/common/collection/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.collection (Lab5Core 2.0 API)</title>
+<title>common.collection (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.collection (Lab5Core 2.0 API)";
+            parent.document.title="common.collection (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/collection/package-tree.html b/Lab5Core/build/docs/javadoc/common/collection/package-tree.html
index ec9297d..60b28b7 100644
--- a/Lab5Core/build/docs/javadoc/common/collection/package-tree.html
+++ b/Lab5Core/build/docs/javadoc/common/collection/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.collection Class Hierarchy (Lab5Core 2.0 API)</title>
+<title>common.collection Class Hierarchy (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.collection Class Hierarchy (Lab5Core 2.0 API)";
+            parent.document.title="common.collection Class Hierarchy (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/Executable.html b/Lab5Core/build/docs/javadoc/common/commandline/Executable.html
index b3474e6..f28431b 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/Executable.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/Executable.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Executable (Lab5Core 2.0 API)</title>
+<title>Executable (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Executable (Lab5Core 2.0 API)";
+            parent.document.title="Executable (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/Executables.html b/Lab5Core/build/docs/javadoc/common/commandline/Executables.html
index d675b32..c3725db 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/Executables.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/Executables.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Executables (Lab5Core 2.0 API)</title>
+<title>Executables (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Executables (Lab5Core 2.0 API)";
+            parent.document.title="Executables (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/package-frame.html b/Lab5Core/build/docs/javadoc/common/commandline/package-frame.html
index 0157f03..d8036fd 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/package-frame.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.commandline (Lab5Core 2.0 API)</title>
+<title>common.commandline (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/package-summary.html b/Lab5Core/build/docs/javadoc/common/commandline/package-summary.html
index 3641aac..cc62c13 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/package-summary.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.commandline (Lab5Core 2.0 API)</title>
+<title>common.commandline (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.commandline (Lab5Core 2.0 API)";
+            parent.document.title="common.commandline (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/package-tree.html b/Lab5Core/build/docs/javadoc/common/commandline/package-tree.html
index 3d0de5f..bfcfcc6 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/package-tree.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.commandline Class Hierarchy (Lab5Core 2.0 API)</title>
+<title>common.commandline Class Hierarchy (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.commandline Class Hierarchy (Lab5Core 2.0 API)";
+            parent.document.title="common.commandline Class Hierarchy (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/CommandResult.html b/Lab5Core/build/docs/javadoc/common/commandline/response/CommandResult.html
index 3144195..f966bd0 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/CommandResult.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/response/CommandResult.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>CommandResult (Lab5Core 2.0 API)</title>
+<title>CommandResult (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandResult (Lab5Core 2.0 API)";
+            parent.document.title="CommandResult (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/DefaultResponse.html b/Lab5Core/build/docs/javadoc/common/commandline/response/DefaultResponse.html
index d157cf4..f43da7c 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/DefaultResponse.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/response/DefaultResponse.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>DefaultResponse (Lab5Core 2.0 API)</title>
+<title>DefaultResponse (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DefaultResponse (Lab5Core 2.0 API)";
+            parent.document.title="DefaultResponse (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/PeopleDatabaseResponse.html b/Lab5Core/build/docs/javadoc/common/commandline/response/PeopleDatabaseResponse.html
index 916834c..1853ca0 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/PeopleDatabaseResponse.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/response/PeopleDatabaseResponse.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>PeopleDatabaseResponse (Lab5Core 2.0 API)</title>
+<title>PeopleDatabaseResponse (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="PeopleDatabaseResponse (Lab5Core 2.0 API)";
+            parent.document.title="PeopleDatabaseResponse (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/Response.html b/Lab5Core/build/docs/javadoc/common/commandline/response/Response.html
index 43a1ac9..02fdefe 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/Response.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/response/Response.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Response (Lab5Core 2.0 API)</title>
+<title>Response (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Response (Lab5Core 2.0 API)";
+            parent.document.title="Response (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/package-frame.html b/Lab5Core/build/docs/javadoc/common/commandline/response/package-frame.html
index 92c3609..91b63f2 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/package-frame.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/response/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.commandline.response (Lab5Core 2.0 API)</title>
+<title>common.commandline.response (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/package-summary.html b/Lab5Core/build/docs/javadoc/common/commandline/response/package-summary.html
index fc4f3b2..04f890d 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/package-summary.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/response/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.commandline.response (Lab5Core 2.0 API)</title>
+<title>common.commandline.response (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.commandline.response (Lab5Core 2.0 API)";
+            parent.document.title="common.commandline.response (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/package-tree.html b/Lab5Core/build/docs/javadoc/common/commandline/response/package-tree.html
index b69fa75..14058b7 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/package-tree.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/response/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.commandline.response Class Hierarchy (Lab5Core 2.0 API)</title>
+<title>common.commandline.response Class Hierarchy (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.commandline.response Class Hierarchy (Lab5Core 2.0 API)";
+            parent.document.title="common.commandline.response Class Hierarchy (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/data/Color.html b/Lab5Core/build/docs/javadoc/common/data/Color.html
index 6edb537..e26d652 100644
--- a/Lab5Core/build/docs/javadoc/common/data/Color.html
+++ b/Lab5Core/build/docs/javadoc/common/data/Color.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Color (Lab5Core 2.0 API)</title>
+<title>Color (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Color (Lab5Core 2.0 API)";
+            parent.document.title="Color (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/data/Coordinates.html b/Lab5Core/build/docs/javadoc/common/data/Coordinates.html
index d9bced5..f5e0433 100644
--- a/Lab5Core/build/docs/javadoc/common/data/Coordinates.html
+++ b/Lab5Core/build/docs/javadoc/common/data/Coordinates.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Coordinates (Lab5Core 2.0 API)</title>
+<title>Coordinates (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Coordinates (Lab5Core 2.0 API)";
+            parent.document.title="Coordinates (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/data/Country.html b/Lab5Core/build/docs/javadoc/common/data/Country.html
index 1b84ff8..6749fff 100644
--- a/Lab5Core/build/docs/javadoc/common/data/Country.html
+++ b/Lab5Core/build/docs/javadoc/common/data/Country.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Country (Lab5Core 2.0 API)</title>
+<title>Country (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Country (Lab5Core 2.0 API)";
+            parent.document.title="Country (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/data/Location.html b/Lab5Core/build/docs/javadoc/common/data/Location.html
index 7354ccc..3d9e4f8 100644
--- a/Lab5Core/build/docs/javadoc/common/data/Location.html
+++ b/Lab5Core/build/docs/javadoc/common/data/Location.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Location (Lab5Core 2.0 API)</title>
+<title>Location (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Location (Lab5Core 2.0 API)";
+            parent.document.title="Location (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/data/Person.html b/Lab5Core/build/docs/javadoc/common/data/Person.html
index d3e7778..913197f 100644
--- a/Lab5Core/build/docs/javadoc/common/data/Person.html
+++ b/Lab5Core/build/docs/javadoc/common/data/Person.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Person (Lab5Core 2.0 API)</title>
+<title>Person (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Person (Lab5Core 2.0 API)";
+            parent.document.title="Person (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/data/package-frame.html b/Lab5Core/build/docs/javadoc/common/data/package-frame.html
index c161a63..5041b46 100644
--- a/Lab5Core/build/docs/javadoc/common/data/package-frame.html
+++ b/Lab5Core/build/docs/javadoc/common/data/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.data (Lab5Core 2.0 API)</title>
+<title>common.data (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
diff --git a/Lab5Core/build/docs/javadoc/common/data/package-summary.html b/Lab5Core/build/docs/javadoc/common/data/package-summary.html
index 9209a7b..56e6c1f 100644
--- a/Lab5Core/build/docs/javadoc/common/data/package-summary.html
+++ b/Lab5Core/build/docs/javadoc/common/data/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.data (Lab5Core 2.0 API)</title>
+<title>common.data (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.data (Lab5Core 2.0 API)";
+            parent.document.title="common.data (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/data/package-tree.html b/Lab5Core/build/docs/javadoc/common/data/package-tree.html
index d6beec8..1a1f349 100644
--- a/Lab5Core/build/docs/javadoc/common/data/package-tree.html
+++ b/Lab5Core/build/docs/javadoc/common/data/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.data Class Hierarchy (Lab5Core 2.0 API)</title>
+<title>common.data Class Hierarchy (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.data Class Hierarchy (Lab5Core 2.0 API)";
+            parent.document.title="common.data Class Hierarchy (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
@@ -91,8 +91,8 @@
 <ul>
 <li type="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
 <ul>
-<li type="circle">common.data.<a href="../../common/data/Color.html" title="enum in common.data"><span class="typeNameLink">Color</span></a> (implements java.io.Serializable)</li>
 <li type="circle">common.data.<a href="../../common/data/Country.html" title="enum in common.data"><span class="typeNameLink">Country</span></a> (implements java.io.Serializable)</li>
+<li type="circle">common.data.<a href="../../common/data/Color.html" title="enum in common.data"><span class="typeNameLink">Color</span></a> (implements java.io.Serializable)</li>
 </ul>
 </li>
 </ul>
diff --git a/Lab5Core/build/docs/javadoc/common/parser/Adapters.ColorAdapter.html b/Lab5Core/build/docs/javadoc/common/parser/Adapters.ColorAdapter.html
index 6c58592..fbd05f8 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/Adapters.ColorAdapter.html
+++ b/Lab5Core/build/docs/javadoc/common/parser/Adapters.ColorAdapter.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Adapters.ColorAdapter (Lab5Core 2.0 API)</title>
+<title>Adapters.ColorAdapter (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Adapters.ColorAdapter (Lab5Core 2.0 API)";
+            parent.document.title="Adapters.ColorAdapter (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/parser/Adapters.CoordinateYAdapter.html b/Lab5Core/build/docs/javadoc/common/parser/Adapters.CoordinateYAdapter.html
index d1bee3c..d567017 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/Adapters.CoordinateYAdapter.html
+++ b/Lab5Core/build/docs/javadoc/common/parser/Adapters.CoordinateYAdapter.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Adapters.CoordinateYAdapter (Lab5Core 2.0 API)</title>
+<title>Adapters.CoordinateYAdapter (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Adapters.CoordinateYAdapter (Lab5Core 2.0 API)";
+            parent.document.title="Adapters.CoordinateYAdapter (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/parser/Adapters.CountryAdapter.html b/Lab5Core/build/docs/javadoc/common/parser/Adapters.CountryAdapter.html
index 0baaefb..712f3c4 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/Adapters.CountryAdapter.html
+++ b/Lab5Core/build/docs/javadoc/common/parser/Adapters.CountryAdapter.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Adapters.CountryAdapter (Lab5Core 2.0 API)</title>
+<title>Adapters.CountryAdapter (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Adapters.CountryAdapter (Lab5Core 2.0 API)";
+            parent.document.title="Adapters.CountryAdapter (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/parser/Adapters.HeightAdapter.html b/Lab5Core/build/docs/javadoc/common/parser/Adapters.HeightAdapter.html
index 94ef19a..e11bfea 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/Adapters.HeightAdapter.html
+++ b/Lab5Core/build/docs/javadoc/common/parser/Adapters.HeightAdapter.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Adapters.HeightAdapter (Lab5Core 2.0 API)</title>
+<title>Adapters.HeightAdapter (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Adapters.HeightAdapter (Lab5Core 2.0 API)";
+            parent.document.title="Adapters.HeightAdapter (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/parser/Adapters.LocalDateAdapter.html b/Lab5Core/build/docs/javadoc/common/parser/Adapters.LocalDateAdapter.html
index 8dbd1d1..2c22497 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/Adapters.LocalDateAdapter.html
+++ b/Lab5Core/build/docs/javadoc/common/parser/Adapters.LocalDateAdapter.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Adapters.LocalDateAdapter (Lab5Core 2.0 API)</title>
+<title>Adapters.LocalDateAdapter (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Adapters.LocalDateAdapter (Lab5Core 2.0 API)";
+            parent.document.title="Adapters.LocalDateAdapter (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/parser/Adapters.NameAdapter.html b/Lab5Core/build/docs/javadoc/common/parser/Adapters.NameAdapter.html
index fa07140..13b8171 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/Adapters.NameAdapter.html
+++ b/Lab5Core/build/docs/javadoc/common/parser/Adapters.NameAdapter.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Adapters.NameAdapter (Lab5Core 2.0 API)</title>
+<title>Adapters.NameAdapter (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Adapters.NameAdapter (Lab5Core 2.0 API)";
+            parent.document.title="Adapters.NameAdapter (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/parser/Adapters.PassportAdapter.html b/Lab5Core/build/docs/javadoc/common/parser/Adapters.PassportAdapter.html
index 359f422..5e6fad4 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/Adapters.PassportAdapter.html
+++ b/Lab5Core/build/docs/javadoc/common/parser/Adapters.PassportAdapter.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Adapters.PassportAdapter (Lab5Core 2.0 API)</title>
+<title>Adapters.PassportAdapter (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Adapters.PassportAdapter (Lab5Core 2.0 API)";
+            parent.document.title="Adapters.PassportAdapter (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/parser/Adapters.html b/Lab5Core/build/docs/javadoc/common/parser/Adapters.html
index 08cff8a..73d2f0c 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/Adapters.html
+++ b/Lab5Core/build/docs/javadoc/common/parser/Adapters.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Adapters (Lab5Core 2.0 API)</title>
+<title>Adapters (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Adapters (Lab5Core 2.0 API)";
+            parent.document.title="Adapters (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/parser/ConnectionProperties.html b/Lab5Core/build/docs/javadoc/common/parser/ConnectionProperties.html
index d5b9365..ed4c689 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/ConnectionProperties.html
+++ b/Lab5Core/build/docs/javadoc/common/parser/ConnectionProperties.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>ConnectionProperties (Lab5Core 2.0 API)</title>
+<title>ConnectionProperties (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,13 +11,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ConnectionProperties (Lab5Core 2.0 API)";
+            parent.document.title="ConnectionProperties (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9};
+var methods = {"i0":9,"i1":9,"i2":9,"i3":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -152,6 +152,14 @@ extends java.lang.Object</pre>
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/ConnectionProperties.html#getPort--">getPort</a></span>()</code>&nbsp;</td>
 </tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/ConnectionProperties.html#setHostname-java.lang.String-">setHostname</a></span>(java.lang.String&nbsp;hostname)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/ConnectionProperties.html#setPort-int-">setPort</a></span>(int&nbsp;port)</code>&nbsp;</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -200,13 +208,31 @@ extends java.lang.Object</pre>
 <pre>public static&nbsp;java.lang.String&nbsp;getHostname()</pre>
 </li>
 </ul>
+<a name="setHostname-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setHostname</h4>
+<pre>public static&nbsp;void&nbsp;setHostname(java.lang.String&nbsp;hostname)</pre>
+</li>
+</ul>
 <a name="getPort--">
 <!--   -->
 </a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getPort</h4>
+<pre>public static&nbsp;int&nbsp;getPort()</pre>
+</li>
+</ul>
+<a name="setPort-int-">
+<!--   -->
+</a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>getPort</h4>
-<pre>public static&nbsp;int&nbsp;getPort()</pre>
+<h4>setPort</h4>
+<pre>public static&nbsp;void&nbsp;setPort(int&nbsp;port)</pre>
 </li>
 </ul>
 </li>
diff --git a/Lab5Core/build/docs/javadoc/common/parser/package-frame.html b/Lab5Core/build/docs/javadoc/common/parser/package-frame.html
index 2def28f..5426bc8 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/package-frame.html
+++ b/Lab5Core/build/docs/javadoc/common/parser/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.parser (Lab5Core 2.0 API)</title>
+<title>common.parser (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
diff --git a/Lab5Core/build/docs/javadoc/common/parser/package-summary.html b/Lab5Core/build/docs/javadoc/common/parser/package-summary.html
index 7873591..9be6a3a 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/package-summary.html
+++ b/Lab5Core/build/docs/javadoc/common/parser/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.parser (Lab5Core 2.0 API)</title>
+<title>common.parser (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.parser (Lab5Core 2.0 API)";
+            parent.document.title="common.parser (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/parser/package-tree.html b/Lab5Core/build/docs/javadoc/common/parser/package-tree.html
index be4787c..6fb4181 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/package-tree.html
+++ b/Lab5Core/build/docs/javadoc/common/parser/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.parser Class Hierarchy (Lab5Core 2.0 API)</title>
+<title>common.parser Class Hierarchy (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.parser Class Hierarchy (Lab5Core 2.0 API)";
+            parent.document.title="common.parser Class Hierarchy (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/util/UtilFunctions.html b/Lab5Core/build/docs/javadoc/common/util/UtilFunctions.html
index 4201da6..508a40b 100644
--- a/Lab5Core/build/docs/javadoc/common/util/UtilFunctions.html
+++ b/Lab5Core/build/docs/javadoc/common/util/UtilFunctions.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>UtilFunctions (Lab5Core 2.0 API)</title>
+<title>UtilFunctions (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="UtilFunctions (Lab5Core 2.0 API)";
+            parent.document.title="UtilFunctions (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/util/package-frame.html b/Lab5Core/build/docs/javadoc/common/util/package-frame.html
index fad8071..b913f44 100644
--- a/Lab5Core/build/docs/javadoc/common/util/package-frame.html
+++ b/Lab5Core/build/docs/javadoc/common/util/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.util (Lab5Core 2.0 API)</title>
+<title>common.util (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
diff --git a/Lab5Core/build/docs/javadoc/common/util/package-summary.html b/Lab5Core/build/docs/javadoc/common/util/package-summary.html
index 1893357..1dd5627 100644
--- a/Lab5Core/build/docs/javadoc/common/util/package-summary.html
+++ b/Lab5Core/build/docs/javadoc/common/util/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.util (Lab5Core 2.0 API)</title>
+<title>common.util (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.util (Lab5Core 2.0 API)";
+            parent.document.title="common.util (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/util/package-tree.html b/Lab5Core/build/docs/javadoc/common/util/package-tree.html
index 0925422..90407a8 100644
--- a/Lab5Core/build/docs/javadoc/common/util/package-tree.html
+++ b/Lab5Core/build/docs/javadoc/common/util/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.util Class Hierarchy (Lab5Core 2.0 API)</title>
+<title>common.util Class Hierarchy (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.util Class Hierarchy (Lab5Core 2.0 API)";
+            parent.document.title="common.util Class Hierarchy (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/constant-values.html b/Lab5Core/build/docs/javadoc/constant-values.html
index 346777b..e8fa3f7 100644
--- a/Lab5Core/build/docs/javadoc/constant-values.html
+++ b/Lab5Core/build/docs/javadoc/constant-values.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Constant Field Values (Lab5Core 2.0 API)</title>
+<title>Constant Field Values (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (Lab5Core 2.0 API)";
+            parent.document.title="Constant Field Values (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/deprecated-list.html b/Lab5Core/build/docs/javadoc/deprecated-list.html
index 8c3c7cc..3add092 100644
--- a/Lab5Core/build/docs/javadoc/deprecated-list.html
+++ b/Lab5Core/build/docs/javadoc/deprecated-list.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Deprecated List (Lab5Core 2.0 API)</title>
+<title>Deprecated List (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List (Lab5Core 2.0 API)";
+            parent.document.title="Deprecated List (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/help-doc.html b/Lab5Core/build/docs/javadoc/help-doc.html
index ae707d4..b004f82 100644
--- a/Lab5Core/build/docs/javadoc/help-doc.html
+++ b/Lab5Core/build/docs/javadoc/help-doc.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>API Help (Lab5Core 2.0 API)</title>
+<title>API Help (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help (Lab5Core 2.0 API)";
+            parent.document.title="API Help (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/index-all.html b/Lab5Core/build/docs/javadoc/index-all.html
index 8071929..b6af161 100644
--- a/Lab5Core/build/docs/javadoc/index-all.html
+++ b/Lab5Core/build/docs/javadoc/index-all.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Index (Lab5Core 2.0 API)</title>
+<title>Index (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Index (Lab5Core 2.0 API)";
+            parent.document.title="Index (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
@@ -375,6 +375,8 @@
 <dd>
 <div class="block">Сеттер для поля height</div>
 </dd>
+<dt><span class="memberNameLink"><a href="common/parser/ConnectionProperties.html#setHostname-java.lang.String-">setHostname(String)</a></span> - Static method in class common.parser.<a href="common/parser/ConnectionProperties.html" title="class in common.parser">ConnectionProperties</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/data/Location.html#setName-java.lang.String-">setName(String)</a></span> - Method in class common.data.<a href="common/data/Location.html" title="class in common.data">Location</a></dt>
 <dd>
 <div class="block">Сеттер для поля name</div>
@@ -387,6 +389,8 @@
 <dd>
 <div class="block">Сеттер для поля passportID</div>
 </dd>
+<dt><span class="memberNameLink"><a href="common/parser/ConnectionProperties.html#setPort-int-">setPort(int)</a></span> - Static method in class common.parser.<a href="common/parser/ConnectionProperties.html" title="class in common.parser">ConnectionProperties</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/data/Coordinates.html#setY-float-">setY(float)</a></span> - Method in class common.data.<a href="common/data/Coordinates.html" title="class in common.data">Coordinates</a></dt>
 <dd>
 <div class="block">Сеттер для поля y</div>
diff --git a/Lab5Core/build/docs/javadoc/index.html b/Lab5Core/build/docs/javadoc/index.html
index 8b1a157..d7d6297 100644
--- a/Lab5Core/build/docs/javadoc/index.html
+++ b/Lab5Core/build/docs/javadoc/index.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Lab5Core 2.0 API</title>
+<title>Lab5Core 2.1 API</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
     if (tmpTargetPage != "" && tmpTargetPage != "undefined")
diff --git a/Lab5Core/build/docs/javadoc/overview-frame.html b/Lab5Core/build/docs/javadoc/overview-frame.html
index 456bfdb..f4c770c 100644
--- a/Lab5Core/build/docs/javadoc/overview-frame.html
+++ b/Lab5Core/build/docs/javadoc/overview-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Overview List (Lab5Core 2.0 API)</title>
+<title>Overview List (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/Lab5Core/build/docs/javadoc/overview-summary.html b/Lab5Core/build/docs/javadoc/overview-summary.html
index 3b52350..d010852 100644
--- a/Lab5Core/build/docs/javadoc/overview-summary.html
+++ b/Lab5Core/build/docs/javadoc/overview-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Overview (Lab5Core 2.0 API)</title>
+<title>Overview (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Overview (Lab5Core 2.0 API)";
+            parent.document.title="Overview (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
@@ -68,7 +68,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title">Lab5Core 2.0 API</h1>
+<h1 class="title">Lab5Core 2.1 API</h1>
 </div>
 <div class="contentContainer">
 <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Packages table, listing packages, and an explanation">
diff --git a/Lab5Core/build/docs/javadoc/overview-tree.html b/Lab5Core/build/docs/javadoc/overview-tree.html
index 380c7e9..f2e0746 100644
--- a/Lab5Core/build/docs/javadoc/overview-tree.html
+++ b/Lab5Core/build/docs/javadoc/overview-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Class Hierarchy (Lab5Core 2.0 API)</title>
+<title>Class Hierarchy (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Class Hierarchy (Lab5Core 2.0 API)";
+            parent.document.title="Class Hierarchy (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/serialized-form.html b/Lab5Core/build/docs/javadoc/serialized-form.html
index 03eb8fb..1b21381 100644
--- a/Lab5Core/build/docs/javadoc/serialized-form.html
+++ b/Lab5Core/build/docs/javadoc/serialized-form.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Serialized Form (Lab5Core 2.0 API)</title>
+<title>Serialized Form (Lab5Core 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Serialized Form (Lab5Core 2.0 API)";
+            parent.document.title="Serialized Form (Lab5Core 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/tmp/javadoc/javadoc.options b/Lab5Core/build/tmp/javadoc/javadoc.options
index 387e206..b2506bd 100644
--- a/Lab5Core/build/tmp/javadoc/javadoc.options
+++ b/Lab5Core/build/tmp/javadoc/javadoc.options
@@ -1,10 +1,10 @@
 -classpath 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\build\\classes\\java\\main;C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\build\\resources\\main;C:\\Users\\egor\\.gradle\\caches\\modules-2\\files-2.1\\org.projectlombok\\lombok\\1.18.22\\9c08ea24c6eb714e2d6170e8122c069a0ba9aacf\\lombok-1.18.22.jar'
 -d 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\build\\docs\\javadoc'
--doctitle 'Lab5Core 2.0 API'
+-doctitle 'Lab5Core 2.1 API'
 -encoding 'UTF-8'
 -notimestamp 
 -quiet 
--windowtitle 'Lab5Core 2.0 API'
+-windowtitle 'Lab5Core 2.1 API'
 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\collection\\Database.java'
 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\collection\\PeopleDatabase.java'
 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\Executable.java'
diff --git a/Lab5Core/src/main/java/common/parser/ConnectionProperties.java b/Lab5Core/src/main/java/common/parser/ConnectionProperties.java
index 0367d0e..3523f3f 100644
--- a/Lab5Core/src/main/java/common/parser/ConnectionProperties.java
+++ b/Lab5Core/src/main/java/common/parser/ConnectionProperties.java
@@ -3,6 +3,7 @@ package common.parser;
 import common.util.UtilFunctions;
 
 import java.io.*;
+import java.net.URL;
 import java.util.Properties;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -13,18 +14,26 @@ public final class ConnectionProperties {
     private static final Logger logger = Logger.getLogger("Lab5");
     private static final int DEFAULT_PORT = 1234;
     private static final String DEFAULT_HOST = "localhost";
+    private static final String FILE_NAME = "connection.properties";
 
     static {
-        File file = new File("connection.properties");
+        File file = new File(FILE_NAME);
         try {
             if (file.exists()) {
                 logger.info("Файл найден, загружаем настройки подключения...");
-            }
-            else {
-                logger.warning("Файл не найден, создание файла " + file.getName());
-                BufferedReader reader = new BufferedReader(new InputStreamReader(ConnectionProperties.class.getClassLoader().getResource("connection.properties").openStream()));
+            } else {
+                logger.warning("Файл не найден, создание файла " + FILE_NAME);
+                URL url = ConnectionProperties.class.getClassLoader().getResource(FILE_NAME);
+                if (url == null) {
+                    logger.severe("Jar файл поврежден, переустановите программу");
+                    System.exit(-1);
+                }
+                BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream()));
                 String content = reader.lines().collect(Collectors.joining("\n"));
-                file.createNewFile();
+                boolean wasCreated = file.createNewFile();
+                if (!wasCreated) {
+                    logger.severe("Невозможно создать файл " + FILE_NAME + ", недостаточно прав");
+                }
                 BufferedWriter writer = new BufferedWriter(new FileWriter(file));
                 writer.write(content);
                 writer.close();
@@ -32,7 +41,7 @@ public final class ConnectionProperties {
                 logger.info("Файл создан, загружаем настройки подключения");
             }
             properties.load(new FileInputStream(file));
-            logger.info("Настройки подключения загружены из файла " + file.getName());
+            logger.info("Настройки подключения загружены из файла " + FILE_NAME);
         } catch (IOException e) {
             e.printStackTrace();
             System.exit(-1);
@@ -47,6 +56,17 @@ public final class ConnectionProperties {
         } else return result;
     }
 
+    public static void setHostname(String hostname) {
+        properties.setProperty("hostname", hostname);
+        File file = new File(FILE_NAME);
+        try (FileWriter writer = new FileWriter(file)) {
+            properties.store(writer, "Changed by user");
+            logger.info("Адрес успешно изменен");
+        } catch (IOException e) {
+            logger.severe("Не удалось сохранить измененные значения");
+        }
+    }
+
     public static int getPort() {
         String resultStr = properties.getProperty("port");
         if (resultStr == null) {
@@ -60,4 +80,15 @@ public final class ConnectionProperties {
         }
         return result;
     }
+
+    public static void setPort(int port) {
+        properties.setProperty("port", String.valueOf(port));
+        File file = new File(FILE_NAME);
+        try (FileWriter writer = new FileWriter(file)) {
+            properties.store(writer, "Changed by user");
+            logger.info("Порт успешно изменен");
+        } catch (IOException e) {
+            logger.severe("Не удалось сохранить измененные значения");
+        }
+    }
 }
diff --git a/Lab5Server/build.gradle.kts b/Lab5Server/build.gradle.kts
index 4f26dce..c9801e7 100644
--- a/Lab5Server/build.gradle.kts
+++ b/Lab5Server/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "ru.erius.lab5"
-version = "2.0"
+version = "2.1"
 val mainClass = "server.Lab5Server"
 
 repositories {
diff --git a/Lab5Server/build/classes/java/main/server/net/UDPServer.class b/Lab5Server/build/classes/java/main/server/net/UDPServer.class
index 1b41531..ef34492 100644
Binary files a/Lab5Server/build/classes/java/main/server/net/UDPServer.class and b/Lab5Server/build/classes/java/main/server/net/UDPServer.class differ
diff --git a/Lab5Server/build/docs/javadoc/allclasses-frame.html b/Lab5Server/build/docs/javadoc/allclasses-frame.html
index e44ed3e..e74de20 100644
--- a/Lab5Server/build/docs/javadoc/allclasses-frame.html
+++ b/Lab5Server/build/docs/javadoc/allclasses-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (Lab5Server 2.0 API)</title>
+<title>All Classes (Lab5Server 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/Lab5Server/build/docs/javadoc/allclasses-noframe.html b/Lab5Server/build/docs/javadoc/allclasses-noframe.html
index 6446e9a..aebfc0a 100644
--- a/Lab5Server/build/docs/javadoc/allclasses-noframe.html
+++ b/Lab5Server/build/docs/javadoc/allclasses-noframe.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (Lab5Server 2.0 API)</title>
+<title>All Classes (Lab5Server 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/Lab5Server/build/docs/javadoc/constant-values.html b/Lab5Server/build/docs/javadoc/constant-values.html
index 320c4b7..64ee51f 100644
--- a/Lab5Server/build/docs/javadoc/constant-values.html
+++ b/Lab5Server/build/docs/javadoc/constant-values.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Constant Field Values (Lab5Server 2.0 API)</title>
+<title>Constant Field Values (Lab5Server 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (Lab5Server 2.0 API)";
+            parent.document.title="Constant Field Values (Lab5Server 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Server/build/docs/javadoc/deprecated-list.html b/Lab5Server/build/docs/javadoc/deprecated-list.html
index e8f69c9..ccaf712 100644
--- a/Lab5Server/build/docs/javadoc/deprecated-list.html
+++ b/Lab5Server/build/docs/javadoc/deprecated-list.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Deprecated List (Lab5Server 2.0 API)</title>
+<title>Deprecated List (Lab5Server 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List (Lab5Server 2.0 API)";
+            parent.document.title="Deprecated List (Lab5Server 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Server/build/docs/javadoc/help-doc.html b/Lab5Server/build/docs/javadoc/help-doc.html
index 11f49fd..f4521fe 100644
--- a/Lab5Server/build/docs/javadoc/help-doc.html
+++ b/Lab5Server/build/docs/javadoc/help-doc.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>API Help (Lab5Server 2.0 API)</title>
+<title>API Help (Lab5Server 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help (Lab5Server 2.0 API)";
+            parent.document.title="API Help (Lab5Server 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Server/build/docs/javadoc/index-all.html b/Lab5Server/build/docs/javadoc/index-all.html
index e10f561..810d9ee 100644
--- a/Lab5Server/build/docs/javadoc/index-all.html
+++ b/Lab5Server/build/docs/javadoc/index-all.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Index (Lab5Server 2.0 API)</title>
+<title>Index (Lab5Server 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Index (Lab5Server 2.0 API)";
+            parent.document.title="Index (Lab5Server 2.1 API)";
         }
     }
     catch(err) {
@@ -132,8 +132,6 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="server/net/UDPServer.html#UDPServer-int-java.util.logging.Logger-">UDPServer(int, Logger)</a></span> - Constructor for class server.net.<a href="server/net/UDPServer.html" title="class in server.net">UDPServer</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="server/net/UDPServer.html#UDPServer-java.lang.String-int-java.util.logging.Logger-">UDPServer(String, int, Logger)</a></span> - Constructor for class server.net.<a href="server/net/UDPServer.html" title="class in server.net">UDPServer</a></dt>
-<dd>&nbsp;</dd>
 </dl>
 <a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:U">U</a>&nbsp;</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
diff --git a/Lab5Server/build/docs/javadoc/index.html b/Lab5Server/build/docs/javadoc/index.html
index 83c8a99..0d4cb5a 100644
--- a/Lab5Server/build/docs/javadoc/index.html
+++ b/Lab5Server/build/docs/javadoc/index.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Lab5Server 2.0 API</title>
+<title>Lab5Server 2.1 API</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
     if (tmpTargetPage != "" && tmpTargetPage != "undefined")
diff --git a/Lab5Server/build/docs/javadoc/overview-frame.html b/Lab5Server/build/docs/javadoc/overview-frame.html
index 9b124f9..d8d9992 100644
--- a/Lab5Server/build/docs/javadoc/overview-frame.html
+++ b/Lab5Server/build/docs/javadoc/overview-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Overview List (Lab5Server 2.0 API)</title>
+<title>Overview List (Lab5Server 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/Lab5Server/build/docs/javadoc/overview-summary.html b/Lab5Server/build/docs/javadoc/overview-summary.html
index a7b567b..fd637db 100644
--- a/Lab5Server/build/docs/javadoc/overview-summary.html
+++ b/Lab5Server/build/docs/javadoc/overview-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Overview (Lab5Server 2.0 API)</title>
+<title>Overview (Lab5Server 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Overview (Lab5Server 2.0 API)";
+            parent.document.title="Overview (Lab5Server 2.1 API)";
         }
     }
     catch(err) {
@@ -68,7 +68,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title">Lab5Server 2.0 API</h1>
+<h1 class="title">Lab5Server 2.1 API</h1>
 </div>
 <div class="contentContainer">
 <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Packages table, listing packages, and an explanation">
diff --git a/Lab5Server/build/docs/javadoc/overview-tree.html b/Lab5Server/build/docs/javadoc/overview-tree.html
index aa3892e..d037c90 100644
--- a/Lab5Server/build/docs/javadoc/overview-tree.html
+++ b/Lab5Server/build/docs/javadoc/overview-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Class Hierarchy (Lab5Server 2.0 API)</title>
+<title>Class Hierarchy (Lab5Server 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Class Hierarchy (Lab5Server 2.0 API)";
+            parent.document.title="Class Hierarchy (Lab5Server 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Server/build/docs/javadoc/server/Lab5Server.html b/Lab5Server/build/docs/javadoc/server/Lab5Server.html
index d4c6a52..f65789b 100644
--- a/Lab5Server/build/docs/javadoc/server/Lab5Server.html
+++ b/Lab5Server/build/docs/javadoc/server/Lab5Server.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Lab5Server (Lab5Server 2.0 API)</title>
+<title>Lab5Server (Lab5Server 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Lab5Server (Lab5Server 2.0 API)";
+            parent.document.title="Lab5Server (Lab5Server 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Server/build/docs/javadoc/server/net/UDPServer.html b/Lab5Server/build/docs/javadoc/server/net/UDPServer.html
index da32c41..998d08e 100644
--- a/Lab5Server/build/docs/javadoc/server/net/UDPServer.html
+++ b/Lab5Server/build/docs/javadoc/server/net/UDPServer.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>UDPServer (Lab5Server 2.0 API)</title>
+<title>UDPServer (Lab5Server 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="UDPServer (Lab5Server 2.0 API)";
+            parent.document.title="UDPServer (Lab5Server 2.1 API)";
         }
     }
     catch(err) {
@@ -130,11 +130,6 @@ extends java.lang.Object</pre>
 <td class="colOne"><code><span class="memberNameLink"><a href="../../server/net/UDPServer.html#UDPServer-int-java.util.logging.Logger-">UDPServer</a></span>(int&nbsp;port,
          java.util.logging.Logger&nbsp;logger)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../server/net/UDPServer.html#UDPServer-java.lang.String-int-java.util.logging.Logger-">UDPServer</a></span>(java.lang.String&nbsp;hostname,
-         int&nbsp;port,
-         java.util.logging.Logger&nbsp;logger)</code>&nbsp;</td>
-</tr>
 </table>
 </li>
 </ul>
@@ -193,21 +188,10 @@ extends java.lang.Object</pre>
 <a name="UDPServer-int-java.util.logging.Logger-">
 <!--   -->
 </a>
-<ul class="blockList">
-<li class="blockList">
-<h4>UDPServer</h4>
-<pre>public&nbsp;UDPServer(int&nbsp;port,
-                 java.util.logging.Logger&nbsp;logger)</pre>
-</li>
-</ul>
-<a name="UDPServer-java.lang.String-int-java.util.logging.Logger-">
-<!--   -->
-</a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>UDPServer</h4>
-<pre>public&nbsp;UDPServer(java.lang.String&nbsp;hostname,
-                 int&nbsp;port,
+<pre>public&nbsp;UDPServer(int&nbsp;port,
                  java.util.logging.Logger&nbsp;logger)</pre>
 </li>
 </ul>
diff --git a/Lab5Server/build/docs/javadoc/server/net/package-frame.html b/Lab5Server/build/docs/javadoc/server/net/package-frame.html
index 80ae5bb..3063e95 100644
--- a/Lab5Server/build/docs/javadoc/server/net/package-frame.html
+++ b/Lab5Server/build/docs/javadoc/server/net/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>server.net (Lab5Server 2.0 API)</title>
+<title>server.net (Lab5Server 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
diff --git a/Lab5Server/build/docs/javadoc/server/net/package-summary.html b/Lab5Server/build/docs/javadoc/server/net/package-summary.html
index c4433f5..3834a54 100644
--- a/Lab5Server/build/docs/javadoc/server/net/package-summary.html
+++ b/Lab5Server/build/docs/javadoc/server/net/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>server.net (Lab5Server 2.0 API)</title>
+<title>server.net (Lab5Server 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="server.net (Lab5Server 2.0 API)";
+            parent.document.title="server.net (Lab5Server 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Server/build/docs/javadoc/server/net/package-tree.html b/Lab5Server/build/docs/javadoc/server/net/package-tree.html
index ea27878..91d175d 100644
--- a/Lab5Server/build/docs/javadoc/server/net/package-tree.html
+++ b/Lab5Server/build/docs/javadoc/server/net/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>server.net Class Hierarchy (Lab5Server 2.0 API)</title>
+<title>server.net Class Hierarchy (Lab5Server 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="server.net Class Hierarchy (Lab5Server 2.0 API)";
+            parent.document.title="server.net Class Hierarchy (Lab5Server 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Server/build/docs/javadoc/server/package-frame.html b/Lab5Server/build/docs/javadoc/server/package-frame.html
index 13a4e8c..14f1282 100644
--- a/Lab5Server/build/docs/javadoc/server/package-frame.html
+++ b/Lab5Server/build/docs/javadoc/server/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>server (Lab5Server 2.0 API)</title>
+<title>server (Lab5Server 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/Lab5Server/build/docs/javadoc/server/package-summary.html b/Lab5Server/build/docs/javadoc/server/package-summary.html
index 65b6641..e92253a 100644
--- a/Lab5Server/build/docs/javadoc/server/package-summary.html
+++ b/Lab5Server/build/docs/javadoc/server/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>server (Lab5Server 2.0 API)</title>
+<title>server (Lab5Server 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="server (Lab5Server 2.0 API)";
+            parent.document.title="server (Lab5Server 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Server/build/docs/javadoc/server/package-tree.html b/Lab5Server/build/docs/javadoc/server/package-tree.html
index 644dc45..60ec335 100644
--- a/Lab5Server/build/docs/javadoc/server/package-tree.html
+++ b/Lab5Server/build/docs/javadoc/server/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>server Class Hierarchy (Lab5Server 2.0 API)</title>
+<title>server Class Hierarchy (Lab5Server 2.1 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="server Class Hierarchy (Lab5Server 2.0 API)";
+            parent.document.title="server Class Hierarchy (Lab5Server 2.1 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Server/build/libs/connection.properties b/Lab5Server/build/libs/connection.properties
index 193632e..749203d 100644
--- a/Lab5Server/build/libs/connection.properties
+++ b/Lab5Server/build/libs/connection.properties
@@ -1,2 +1,2 @@
-hostname=s316304@helios.se.ifmo.ru
-port=1234
\ No newline at end of file
+hostname=localhost
+port=3232
\ No newline at end of file
diff --git a/Lab5Server/build/tmp/compileJava/previous-compilation-data.bin b/Lab5Server/build/tmp/compileJava/previous-compilation-data.bin
index fd05344..7414b7b 100644
Binary files a/Lab5Server/build/tmp/compileJava/previous-compilation-data.bin and b/Lab5Server/build/tmp/compileJava/previous-compilation-data.bin differ
diff --git a/Lab5Server/build/tmp/javadoc/javadoc.options b/Lab5Server/build/tmp/javadoc/javadoc.options
index 91a1614..8824164 100644
--- a/Lab5Server/build/tmp/javadoc/javadoc.options
+++ b/Lab5Server/build/tmp/javadoc/javadoc.options
@@ -1,9 +1,9 @@
--classpath 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Server\\build\\classes\\java\\main;C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Server\\build\\resources\\main;C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\build\\libs\\Lab5Core-2.0.jar'
+-classpath 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Server\\build\\classes\\java\\main;C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Server\\build\\resources\\main;C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\build\\libs\\Lab5Core-2.1.jar'
 -d 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Server\\build\\docs\\javadoc'
--doctitle 'Lab5Server 2.0 API'
+-doctitle 'Lab5Server 2.1 API'
 -encoding 'UTF-8'
 -notimestamp 
 -quiet 
--windowtitle 'Lab5Server 2.0 API'
+-windowtitle 'Lab5Server 2.1 API'
 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Server\\src\\main\\java\\server\\Lab5Server.java'
 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Server\\src\\main\\java\\server\\net\\UDPServer.java'
diff --git a/Lab5Server/src/main/java/server/Lab5Server.java b/Lab5Server/src/main/java/server/Lab5Server.java
index 638e203..844b2c7 100644
--- a/Lab5Server/src/main/java/server/Lab5Server.java
+++ b/Lab5Server/src/main/java/server/Lab5Server.java
@@ -11,6 +11,7 @@ public class Lab5Server {
 
     public final static Logger logger = Logger.getLogger("Lab5Server");
 
+
     public static void main(String[] args) {
         PeopleDatabase peopleDatabase = new PeopleDatabase(logger);
         try {
@@ -19,7 +20,7 @@ public class Lab5Server {
             System.out.println(e.getMessage());
             System.exit(-1);
         }
-        UDPServer udp = new UDPServer(ConnectionProperties.getHostname(), ConnectionProperties.getPort(), logger);
+        UDPServer udp = new UDPServer(ConnectionProperties.getPort(), logger);
         if (!udp.connect()) System.exit(-1);
         while (true)
             udp.receive(peopleDatabase);
diff --git a/Lab5Server/src/main/java/server/net/UDPServer.java b/Lab5Server/src/main/java/server/net/UDPServer.java
index 66b22c7..14d534e 100644
--- a/Lab5Server/src/main/java/server/net/UDPServer.java
+++ b/Lab5Server/src/main/java/server/net/UDPServer.java
@@ -13,34 +13,24 @@ import java.util.logging.Logger;
 
 public class UDPServer {
 
-    private String hostname;
     private final int port;
     private DatagramSocket socket;
     private final Logger logger;
+    private final static int BUFFER_SIZE = 65_535;
 
     public UDPServer(int port, Logger logger) {
         this.port = port;
         this.logger = logger;
     }
 
-    public UDPServer(String hostname, int port, Logger logger) {
-        this.hostname = hostname;
-        this.port = port;
-        this.logger = logger;
-    }
-
     public boolean connect() {
         logger.info("Подключаемся...");
         try {
-            InetAddress address = hostname == null ? InetAddress.getLocalHost() : InetAddress.getByName(hostname);
             socket = new DatagramSocket(port);
             logger.info("Подключение установлено");
             return true;
-        } catch (UnknownHostException e) {
-            logger.severe("Хост не найден");
-            return false;
         } catch (SocketException e) {
-            logger.severe("Не удалось открыть сокет");
+            logger.severe("Не удалось установить соединение, порт занят");
             return false;
         }
     }
@@ -59,15 +49,19 @@ public class UDPServer {
             buffer = byteOutputStream.toByteArray();
             DatagramPacket request = new DatagramPacket(buffer, buffer.length, address, port);
             socket.send(request);
+        } catch (SocketTimeoutException e) {
+            logger.severe("Не удалось отправить данные клиенту, клиент не отвечает");
+            return;
         } catch (IOException e) {
             logger.severe("Не удалось отправить данные клиенту, неполадки в соединении");
+            return;
         }
         logger.info("Результат отправлен клиенту");
     }
 
     public void receive(PeopleDatabase peopleDatabase) {
         logger.info("Ожидаем отправки данных от клиента...");
-        byte[] buffer = new byte[65535];
+        byte[] buffer = new byte[BUFFER_SIZE];
         DatagramPacket request = new DatagramPacket(buffer, buffer.length);
         CommandResult result;
         try (ByteArrayInputStream byteInputStream = new ByteArrayInputStream(buffer)) {
@@ -93,7 +87,7 @@ public class UDPServer {
             Response response = DefaultResponse.TYPE_ERROR;
             result = new CommandResult(response.getMsg(), response);
         }
-        logger.info("Команда выполнена, сохраняем результат и отправляем результат клиенту...");
+        logger.info("Команда выполнена, сохраняем и отправляем результат клиенту...");
         Executables.SAVE.getExecutable().execute(new Object[]{ peopleDatabase });
         send(result, request.getAddress(), request.getPort());
     }
diff --git a/build.gradle.kts b/build.gradle.kts
index 550180a..c9066a4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 group = "ru.erius.lab5"
-version = "2.0"
+version = "2.1"
 
 repositories {
     mavenCentral()
