diff --git a/ChangeLog b/ChangeLog
index efe64e62..8794313b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@ TODO working on bug fix: Windows: driver is changed during connection results
      sometimes in lowed noise
 
 
+- connect dialog list is sorted by the ping time
+
+- software icon changed
+
+- bug fix: fixed crash on slave server unregistering
+
 
 3.2.0
 
diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp
index 9d6596a9..c47aac9f 100755
--- a/src/connectdlg.cpp
+++ b/src/connectdlg.cpp
@@ -26,11 +26,14 @@
 
 
 /* Implementation *************************************************************/
-CConnectDlg::CConnectDlg ( QWidget* parent, Qt::WindowFlags f )
+CConnectDlg::CConnectDlg ( const bool bNewShowCompleteRegList,
+                           QWidget* parent,
+                           Qt::WindowFlags f )
     : QDialog ( parent, f ),
       strCentralServerAddress  ( "" ),
       strSelectedAddress       ( "" ),
       strSelectedServerName    ( "" ),
+      bShowCompleteRegList     ( bNewShowCompleteRegList ),
       bServerListReceived      ( false ),
       bStateOK                 ( false ),
       bServerListItemWasChosen ( false )
@@ -239,8 +242,11 @@ void CConnectDlg::SetServerList ( const CHostAddress&         InetAddr,
         QTreeWidgetItem* pNewListViewItem = new QTreeWidgetItem ( lvwServers );
 
         // make the entry invisible (will be set to visible on successful ping
-        // result)
-        pNewListViewItem->setHidden ( true );
+        // result) if the complete list of registered servers shall not be shown
+        if ( !bShowCompleteRegList )
+        {
+            pNewListViewItem->setHidden ( true );
+        }
 
         // server name (if empty, show host address instead)
         if ( !vecServerInfo[iIdx].strName.isEmpty() )
diff --git a/src/connectdlg.h b/src/connectdlg.h
index 06191028..a87ada97 100755
--- a/src/connectdlg.h
+++ b/src/connectdlg.h
@@ -54,7 +54,9 @@ class CConnectDlg : public QDialog, private Ui_CConnectDlgBase
     Q_OBJECT
 
 public:
-    CConnectDlg ( QWidget* parent = 0, Qt::WindowFlags f = 0 );
+    CConnectDlg ( const bool bNewShowCompleteRegList,
+                  QWidget* parent = 0,
+                  Qt::WindowFlags f = 0 );
 
     void Init ( const QString           strNewCentralServerAddr, 
                 const CVector<QString>& vstrIPAddresses );
@@ -83,6 +85,7 @@ protected:
     CVector<QString> vstrIPAddresses;
     QString          strSelectedAddress;
     QString          strSelectedServerName;
+    bool             bShowCompleteRegList;
     bool             bServerListReceived;
     bool             bStateOK;
     bool             bServerListItemWasChosen;
diff --git a/src/llconclientdlg.cpp b/src/llconclientdlg.cpp
index 852ec80b..d71a038c 100755
--- a/src/llconclientdlg.cpp
+++ b/src/llconclientdlg.cpp
@@ -30,6 +30,7 @@ CLlconClientDlg::CLlconClientDlg ( CClient*        pNCliP,
                                    CSettings*      pNSetP,
                                    const bool      bNewConnectOnStartup,
                                    const bool      bNewDisalbeLEDs,
+                                   const bool      bNewShowComplRegConnList,
                                    QWidget*        parent,
                                    Qt::WindowFlags f ) :
     QDialog            ( parent, f ),
@@ -38,7 +39,7 @@ CLlconClientDlg::CLlconClientDlg ( CClient*        pNCliP,
     bUnreadChatMessage ( false ),
     ClientSettingsDlg  ( pNCliP, parent, Qt::Window ),
     ChatDlg            ( parent, Qt::Window ),
-    ConnectDlg         ( parent, Qt::Dialog )
+    ConnectDlg         ( bNewShowComplRegConnList, parent, Qt::Dialog )
 {
     setupUi ( this );
 
diff --git a/src/llconclientdlg.h b/src/llconclientdlg.h
index bdfa3c58..2ae84ccc 100755
--- a/src/llconclientdlg.h
+++ b/src/llconclientdlg.h
@@ -79,6 +79,7 @@ public:
                       CSettings*      pNSetP,
                       const bool      bNewConnectOnStartup,
                       const bool      bNewDisalbeLEDs,
+                      const bool      bNewShowComplRegConnList,
                       QWidget*        parent = 0,
                       Qt::WindowFlags f = 0 );
 
diff --git a/src/main.cpp b/src/main.cpp
index 0ebe7c91..a035afec 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -58,6 +58,7 @@ int main ( int argc, char** argv )
     bool    bStartMinimized       = false;
     bool    bConnectOnStartup     = false;
     bool    bDisalbeLEDs          = false;
+    bool    bShowComplRegConnList = false;
     int     iNumServerChannels    = DEFAULT_USED_NUM_CHANNELS;
     quint16 iPortNumber           = LLCON_DEFAULT_PORT_NUMBER;
     QString strIniFileName        = "";
@@ -142,6 +143,21 @@ int main ( int argc, char** argv )
         }
 
 
+        // Show all registered servers in the server list ----------------------
+        // Undocumented debugging command line argument: Show all registered
+        // servers in the server list regardless if a ping to the server is
+        // possible or not
+        if ( GetFlagArgument ( argv,
+                               i,
+                               "--showallservers", // no short form
+                               "--showallservers" ) )
+        {
+            bShowComplRegConnList = true;
+            tsConsole << "- show all registered servers in server list" << endl;
+            continue;
+        }
+
+
         // Use logging ---------------------------------------------------------
         if ( GetStringArgument ( tsConsole,
                                  argc,
@@ -353,6 +369,7 @@ int main ( int argc, char** argv )
                 &Settings,
                 bConnectOnStartup,
                 bDisalbeLEDs,
+                bShowComplRegConnList,
                 0,
                 Qt::Window );
 
diff --git a/windows/sound.cpp b/windows/sound.cpp
index 0b791126..a7eed8da 100755
--- a/windows/sound.cpp
+++ b/windows/sound.cpp
@@ -972,6 +972,16 @@ long CSound::asioMessages ( long selector,
 
 // TODO implement separate ASIO reset function in base class!
 
+// kAsioBufferSizeChange:
+// Informs the application that the driver has a new preferred buffer size.
+//
+// kAsioResetRequest:
+// Requests a driver reset. If accepted, this will close the driver
+// (ASIOExit() ) and re-open it again (ASIOInit() etc.) at the next
+// "safe" time (usually during the application IDLE time). Some
+// drivers need to reconfigure for instance when the sample rate
+// changes, or some basic changes have been made in ASIOControlPanel().
+
 
             pSound->EmitReinitRequestSignal();
             ret = 1L; // 1L if request is accepted or 0 otherwise