diff --git a/src/main.cpp b/src/main.cpp
index d9acf570..98c4546f 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -114,7 +114,8 @@ int main ( int argc, char** argv )
 		}
 		else
 		{
-			// only start application without using the GUI
+			// only start application without using the GUI
+			qDebug ( CAboutDlg::GetVersionAndNameStr () );
 			app.exec ();
 		}
 	}
diff --git a/src/server.cpp b/src/server.cpp
index e40ada22..22ca0c39 100755
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -48,7 +48,7 @@ void CServer::Start ()
 		/* init time for response time evaluation */
 		TimeLastBlock = QTime::currentTime ();
 
-qDebug("Server started");
+		qDebug("Server started");
 	}
 }
 
@@ -56,6 +56,8 @@ void CServer::Stop ()
 {
 	/* stop main timer */
 	Timer.stop ();
+
+	qDebug("Server stopped");
 }
 
 void CServer::OnTimer ()
@@ -103,8 +105,6 @@ void CServer::OnTimer ()
 		// Disable server if no clients are connected. In this case the server
 		// does not consume any significant CPU when no client is connected.
 		Stop ();
-
-qDebug("Server stopped");
 	}
 }
 
diff --git a/src/util.cpp b/src/util.cpp
index 40e07c9e..0ba4c478 100755
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -254,14 +254,22 @@ CAboutDlg::CAboutDlg(QWidget* parent, const char* name, bool modal, WFlags f)
 		"</center><br>");
 
 	/* Set version number in about dialog */
+	TextLabelVersion->setText(GetVersionAndNameStr());
+}
+
+QString CAboutDlg::GetVersionAndNameStr()
+{
 	QString strVersionText;
+
+	// name, short description and GPL hint
 	strVersionText = "<center><b>" + tr("llcon, Version ");
 	strVersionText += VERSION;
 	strVersionText += "</b><br> " +
 	tr("llcon, Low-Latency (Internet) Connection") + "<br>";
 	strVersionText += tr("Under the GNU General Public License (GPL)") +
 		"</center>";
-	TextLabelVersion->setText(strVersionText);
+
+	return strVersionText;
 }
 
 
diff --git a/src/util.h b/src/util.h
index 777b1499..d08562ee 100755
--- a/src/util.h
+++ b/src/util.h
@@ -303,6 +303,8 @@ class CAboutDlg : public CAboutDlgBase
 public:
 	CAboutDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE,
 		WFlags f = 0);
+
+	static QString GetVersionAndNameStr();
 };