diff --git a/ChangeLog b/ChangeLog
index eb4f99df..fb3a7d16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2.2.2
+
+- Mute and Solo check boxes for each connected client fader
+
+- changes to the main GUI (grouped "local" and "server" settings)
+
+- LED status lights and LED input level meter
+
+- better behaviour on disconnection (introduced disconnection protocol message)
+
+
 2.2.1
 
 - bug fix and improvements for automatic jitter buffer size setting
diff --git a/linux/Makefile.am b/linux/Makefile.am
index 0ae5de17..3231a007 100755
--- a/linux/Makefile.am
+++ b/linux/Makefile.am
@@ -35,6 +35,7 @@ llcon_SOURCES = ../src/buffer.cpp \
 	../src/multicolorled.h \
 	../src/multicolorledbar.h \
 	../src/audiomixerboard.h \
+	../src/testbench.h \
 	../src/soundbase.h \
 	../src/llconserverdlg.h \
 	../src/chatdlg.h \
@@ -92,6 +93,7 @@ BUILT_SOURCES=moc/moc_server.cpp \
 	moc/moc_multicolorledbar.cpp \
 	moc/moc_audiomixerboard.cpp \
 	moc/moc_util.cpp \
+	moc/moc_testbench.cpp \
 	moc/moc_llconclientdlg.cpp \
 	moc/llconclientdlgbase.h \
 	moc/moc_clientsettingsdlg.cpp \
@@ -141,6 +143,9 @@ moc/moc_protocol.cpp: ../src/protocol.h
 moc/moc_channel.cpp: ../src/channel.h
 	$(QT_MOC) ../src/channel.h -o moc/moc_channel.cpp
 
+moc/moc_testbench.cpp: ../src/testbench.h
+	$(QT_MOC) ../src/testbench.h -o moc/moc_testbench.cpp
+
 
 moc/moc_llconclientdlg.cpp: ../src/llconclientdlg.h
 	$(QT_MOC) ../src/llconclientdlg.h -o moc/moc_llconclientdlg.cpp
diff --git a/src/client.cpp b/src/client.cpp
index 52190c0c..4ce2e795 100755
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -238,7 +238,11 @@ void CClient::Stop()
     // stop audio interface
     Sound.Stop();
 
-    // send disconnect message to server
+    // send disconnect message to server (since we disable our protocol
+    // receive mechanism with the next command, we do not evaluate any
+    // respond from the server, therefore we just hope that the message
+    // gets its way to the server, if not, the old behaviour time-out
+    // disconnects the connection anyway)
     Channel.CreateDisconnectionMes();
 
     // disable channel
diff --git a/src/main.cpp b/src/main.cpp
index b018a0ea..e89c3961 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -31,12 +31,11 @@
 #include "settings.h"
 
 
-/*
 // TEST -> activate the following two lines to activate the test bench,
-// currently only supported for Windows
-#include "testbench.h"
+#if 0
+# include "testbench.h"
 CTestbench Testbench;
-*/
+#endif
 
 
 // Implementation **************************************************************
diff --git a/src/testbench.h b/src/testbench.h
index 192f86d5..77924ef2 100755
--- a/src/testbench.h
+++ b/src/testbench.h
@@ -31,6 +31,7 @@
 #include <qhostaddress.h>
 #include "global.h"
 #include "socket.h"
+#include "protocol.h"
 #include "util.h"
 
 
@@ -49,13 +50,24 @@ public:
     }
 
 protected:
-    QTimer  Timer;
-    CSocket Socket;
+    int GenRandomIntInRange ( const int iStart, const int iEnd ) const
+    {
+        return static_cast<int> ( iStart +
+            ( ( static_cast<double> ( iEnd - iStart) * rand() ) / RAND_MAX ) );
+    }
+
+    QTimer    Timer;
+    CSocket   Socket;
+    CProtocol Protocol;
 
 public slots:
     void OnTimer()
     {
 
+// TEST check if random number generator works as expected
+static FILE* pFile = fopen ( "test.txt", "w" );
+fprintf ( pFile, "%d\n", GenRandomIntInRange ( 2, 5 ) );
+fflush ( pFile );
 
     }
 };