diff --git a/server/src/random.c b/server/src/random.c
index e169e4983..4d08c0844 100644
--- a/server/src/random.c
+++ b/server/src/random.c
@@ -37,9 +37,11 @@ int main(int argc, char *argv[])
 		printf("Usage: %s VALUES RATE\n", argv[0]);
 		printf("  VALUES is the number of values a message contains\n");
 		printf("  RATE   how many messages per second\n\n");
-		printf("Simulator2Simulator Server %s (built on %s %s)\n", BLU(VERSION), MAG(__DATE__), MAG(__TIME__));
-		printf(" Copyright 2014, Institute for Automation of Complex Power Systems, EONERC\n");
-		printf("   Steffen Vogel <stvogel@eonerc.rwth-aachen.de>\n");
+
+		printf("Simulator2Simulator Server %s (built on %s %s)\n",
+			BLU(VERSION), MAG(__DATE__), MAG(__TIME__));
+		printf(" Copyright 2015, Institute for Automation of Complex Power Systems, EONERC\n");
+		printf(" Steffen Vogel <StVogel@eonerc.rwth-aachen.de>\n");
 
 		exit(EXIT_FAILURE);
 	}
diff --git a/server/src/receive.c b/server/src/receive.c
index bce4cb900..378311073 100644
--- a/server/src/receive.c
+++ b/server/src/receive.c
@@ -35,13 +35,16 @@ void quit(int sig, siginfo_t *si, void *ptr)
 
 void usage(char *name)
 {
-	printf("Usage: %s CONFIG NODE\n", name);
+	printf("Usage: %s [-r] CONFIG NODE\n", name);
+	printf("  -r      swap local / remote address of socket based nodes)\n\n");
 	printf("  CONFIG  path to a configuration file\n");
 	printf("  NODE    name of the node which shoud be used\n\n");
+
 	printf("Simulator2Simulator Server %s (built on %s %s)\n",
 		BLU(VERSION), MAG(__DATE__), MAG(__TIME__));
-	printf(" Copyright 2014, Institute for Automation of Complex Power Systems, EONERC\n");
-	printf("   Steffen Vogel <stvogel@eonerc.rwth-aachen.de>\n");
+	printf(" Copyright 2015, Institute for Automation of Complex Power Systems, EONERC\n");
+	printf(" Steffen Vogel <StVogel@eonerc.rwth-aachen.de>\n");
+
 	exit(EXIT_FAILURE);
 }
 
diff --git a/server/src/send.c b/server/src/send.c
index a9897bb62..a4f841e7a 100644
--- a/server/src/send.c
+++ b/server/src/send.c
@@ -38,13 +38,15 @@ void quit(int sig, siginfo_t *si, void *ptr)
 void usage(char *name)
 {
 	printf("Usage: %s [-r] CONFIG NODE\n", name);
-	printf("  -r      swap local / remote address of socket based nodes)\n");
+	printf("  -r      swap local / remote address of socket based nodes)\n\n");
 	printf("  CONFIG  path to a configuration file\n");
 	printf("  NODE    name of the node which shoud be used\n");
+
 	printf("Simulator2Simulator Server %s (built on %s %s)\n",
 		BLU(VERSION), MAG(__DATE__), MAG(__TIME__));
-	printf(" Copyright 2014, Institute for Automation of Complex Power Systems, EONERC\n");
-	printf("   Steffen Vogel <stvogel@eonerc.rwth-aachen.de>\n");
+	printf(" Copyright 2015, Institute for Automation of Complex Power Systems, EONERC\n");
+	printf(" Steffen Vogel <StVogel@eonerc.rwth-aachen.de>\n");
+
 	exit(EXIT_FAILURE);
 }
 
diff --git a/server/src/server.c b/server/src/server.c
index 5da2a3167..ccd1e1018 100644
--- a/server/src/server.c
+++ b/server/src/server.c
@@ -96,6 +96,7 @@ void signals_init()
 	};
 
 	sigemptyset(&sa_quit.sa_mask);
+	sigaction(SIGQUIT, &sa_quit, NULL);
 	sigaction(SIGTERM, &sa_quit, NULL);
 	sigaction(SIGINT, &sa_quit, NULL);
 }
@@ -109,10 +110,12 @@ void usage(const char *name)
 	printf("  This type of invocation is used by OPAL-RT Asynchronous processes.\n");
 	printf("  See in the RT-LAB User Guide for more information.\n\n");
 #endif
-	printf("Simulator2Simulator Server %s (built on %s, %s)\n",
+	printf("Simulator2Simulator Server %s (built on %s %s)\n",
 		BLU(VERSION), MAG(__DATE__), MAG(__TIME__));
-	
-	die();
+	printf(" Copyright 2015, Institute for Automation of Complex Power Systems, EONERC\n");
+	printf(" Steffen Vogel <StVogel@eonerc.rwth-aachen.de>\n");
+
+	exit(EXIT_FAILURE);
 }
 
 int main(int argc, char *argv[])
diff --git a/server/src/test.c b/server/src/test.c
index 6a8fbb6e1..2deec58bf 100644
--- a/server/src/test.c
+++ b/server/src/test.c
@@ -67,10 +67,12 @@ int main(int argc, char *argv[])
 		printf("  CONFIG  path to a configuration file\n");
 		printf("  TEST    the name of the test to execute: 'rtt'\n");
 		printf("  NODE    name of the node which shoud be used\n\n");
+
 		printf("Simulator2Simulator Server %s (built on %s %s)\n",
 			BLU(VERSION), MAG(__DATE__), MAG(__TIME__));
-		printf(" Copyright 2014, Institute for Automation of Complex Power Systems, EONERC\n");
-		printf("   Steffen Vogel <stvogel@eonerc.rwth-aachen.de>\n");
+		printf(" Copyright 2015, Institute for Automation of Complex Power Systems, EONERC\n");
+		printf(" Steffen Vogel <StVogel@eonerc.rwth-aachen.de>\n");
+
 		exit(EXIT_FAILURE);
 	}