diff --git a/RELEASE.txt b/RELEASE.txt
index fbdd2c3de..07805b21a 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -68,7 +68,7 @@ Please refer to the link below for more details on the firmware versions.
 
 	Gotthard
 	========   
-    Minimum compatible version	: old one
+    Minimum compatible version	: 11.01.2013
     Latest version				: 08.02.2018 (50um and 25um Master)
         						  09.02.2018 (25 um Slave) 
 
@@ -202,8 +202,9 @@ New Features
 		
 	13.	(25um Gotthard) Added start acquisition delay to master module.
 	
-	14. (Gotthard) New constraints include minimum exposure time is 186 ns and
-		minimum period is 1278 ns + current exposure time.
+	14. (Gotthard) New constraints for firmware dated 08.02.2018 and 09.02.2018 
+		(25 um Slave) include minimum exposure time is 186 ns and minimum 
+		period is 1278 ns + current exposure time.
 	
 	
 	Receiver
diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
index 9422c6063..68b17f2ed 100644
--- a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
+++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer 
 URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: ac9d9f6a9312d17b1e01e5649bda9278f0466533 
-Revision: 220 
-Branch: 3.0.1 
+Repsitory UUID: 675d69392a6497d42b23057c7c8783c8dad768d0 
+Revision: 223 
+Branch: 3.1.0-rc 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 3438 
-Last Changed Date: 2018-02-26 17:01:54.000000002 +0100 ./firmware_funcs.c
+Last Changed Rev: 3447 
+Last Changed Date: 2018-02-27 14:04:08.000000002 +0100 ./server_funcs.c
diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
index fdeda95cb..6c3fb814c 100644
--- a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
+++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "ac9d9f6a9312d17b1e01e5649bda9278f0466533"
+#define GITREPUUID "675d69392a6497d42b23057c7c8783c8dad768d0"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x3438
-#define GITDATE 0x20180226
-#define GITBRANCH "3.0.1"
+#define GITREV 0x3447
+#define GITDATE 0x20180227
+#define GITBRANCH "3.1.0-rc"
diff --git a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.1.0.0 b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.1.0.0
deleted file mode 100755
index 7553d5cd1..000000000
Binary files a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.1.0.0 and /dev/null differ
diff --git a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.1.0.1 b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.1.0.1
new file mode 100755
index 000000000..8323e5aac
Binary files /dev/null and b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.1.0.1 differ
diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
index ca3d03153..b3dee5d5d 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
@@ -579,16 +579,18 @@ int get_id(int file_des) {
 
 #ifdef VERBOSE
       printf("Getting id %d\n", arg);
-#endif  
+#endif
 
   switch (arg) {
   case DETECTOR_SERIAL_NUMBER:
     retval=getDetectorNumber();
     break;
   case DETECTOR_FIRMWARE_VERSION:
-    return  (getFirmwareVersion() & 0xFFFFFF);
+    retval = (getFirmwareVersion() & 0xFFFFFF);
+    break;
   case DETECTOR_SOFTWARE_VERSION:
-    return  (GITDATE & 0xFFFFFF);
+    retval = (GITDATE & 0xFFFFFF);
+    break;
   default:
     printf("Required unknown id %d \n", arg);
     ret=FAIL;
diff --git a/slsDetectorSoftware/moenchDetectorServer/server_funcs.c b/slsDetectorSoftware/moenchDetectorServer/server_funcs.c
index 2463e7971..33f776c33 100755
--- a/slsDetectorSoftware/moenchDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/moenchDetectorServer/server_funcs.c
@@ -593,9 +593,11 @@ int get_id(int file_des) {
     retval=getDetectorNumber();
     break;
   case DETECTOR_FIRMWARE_VERSION:
-    return  (getFirmwareVersion() & 0xFFFFFF);
+    retval = (getFirmwareVersion() & 0xFFFFFF);
+    break;
   case DETECTOR_SOFTWARE_VERSION:
-    return  (GITDATE & 0xFFFFFF);
+    retval = (GITDATE & 0xFFFFFF);
+    break;
   default:
     printf("Required unknown id %d \n", arg);
     ret=FAIL;