diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f47daee4..cd61071e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ if (USE_HDF5)
 	find_package(HDF5 1.10 COMPONENTS CXX)
 endif (USE_HDF5)
 
-
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 add_subdirectory(slsDetectorSoftware)
 add_subdirectory(slsReceiverSoftware)
diff --git a/RELEASE.txt b/RELEASE.txt
index b4ad9c8f5..6699d402c 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -7,10 +7,20 @@ INTRODUCTION
 
 This document describes the differences between previous versions and 3.0.0 releases.
 
-Manuals can be found under the 'manual/docs' folder. Both HTML and pdf versions are provided.
+Manual (both HTML and pdf versions) are provided in
+	manual/docs/
 
-Documentation from Source Code can be found for the Command Line and for the API for
-both HTML and pdf versions as slsDetectorClientDocs and slsDetectorUsersDocs respectively.
+Documentation from Source Code can be found for the Command Line and for the API in
+	html:
+		manual/docs/html/slsDetectorClientDocs/index.html
+		manual/docs/html/slsDetectorUsersDocs/index.html
+	pdf:
+		manual/docs/pdf/slsDetectorClientDocs.pdf
+		manual/docs/pdf/slsDetectorUsersDocs.pdf
+
+Example including binaries for detector and receiver user classes can be found in 
+
+	manual/manual-api
 	
 User documentation can also be accessed directly at this location:
 
@@ -87,7 +97,7 @@ Reiterating, both 2.3 and 3.0 supports the following features:
 		
 	4.	Multiple Receivers have to be started as different processes, instead of threads
 		due to static variables being used. Please refer example code provided in the 
-		slsDetectorsPackage/users folder (mainReceiver.cpp).
+		slsDetectorsPackage/manual/manual-api folder (mainReceiver.cpp).
 		
 
 
@@ -147,9 +157,9 @@ New Features
 	  	receiver streamer threads) via the command line
 	
 		
-	Users
+	Users-API
 	-----
-	11.	Users example forks new child processes for every extra receiver object.
+	11.	manual-api example forks new child processes for every extra receiver object.
 
 
 
diff --git a/manual/docs/html/angularCalibrationHowTo/angularCalibrationHowTo.html b/manual/docs/html/angularCalibrationHowTo/angularCalibrationHowTo.html
index 11a4a9e49..856ee5cd2 100644
--- a/manual/docs/html/angularCalibrationHowTo/angularCalibrationHowTo.html
+++ b/manual/docs/html/angularCalibrationHowTo/angularCalibrationHowTo.html
@@ -44,7 +44,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <DIV>
 
 <P ALIGN="CENTER"><STRONG>Anna Bergamaschi</STRONG></P>
-<P ALIGN="CENTER"><STRONG>August 22, 2017</STRONG></P>
+<P ALIGN="CENTER"><STRONG>August 24, 2017</STRONG></P>
 </DIV>
 
 <P>
@@ -78,7 +78,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/angularCalibrationHowTo/index.html b/manual/docs/html/angularCalibrationHowTo/index.html
index 11a4a9e49..856ee5cd2 100644
--- a/manual/docs/html/angularCalibrationHowTo/index.html
+++ b/manual/docs/html/angularCalibrationHowTo/index.html
@@ -44,7 +44,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <DIV>
 
 <P ALIGN="CENTER"><STRONG>Anna Bergamaschi</STRONG></P>
-<P ALIGN="CENTER"><STRONG>August 22, 2017</STRONG></P>
+<P ALIGN="CENTER"><STRONG>August 24, 2017</STRONG></P>
 </DIV>
 
 <P>
@@ -78,7 +78,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/angularCalibrationHowTo/node1.html b/manual/docs/html/angularCalibrationHowTo/node1.html
index 28865e6f3..a9c547610 100644
--- a/manual/docs/html/angularCalibrationHowTo/node1.html
+++ b/manual/docs/html/angularCalibrationHowTo/node1.html
@@ -180,7 +180,7 @@ These results show that  the angular calibration allows a resolution in determin
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/angularCalibrationHowTo/node2.html b/manual/docs/html/angularCalibrationHowTo/node2.html
index 7229c62c9..30cefefe4 100644
--- a/manual/docs/html/angularCalibrationHowTo/node2.html
+++ b/manual/docs/html/angularCalibrationHowTo/node2.html
@@ -211,7 +211,7 @@ Acquisition GUI window to setup the motor position scan.</CAPTION>
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/angularCalibrationHowTo/node3.html b/manual/docs/html/angularCalibrationHowTo/node3.html
index ac58a2b9f..7b37ceda1 100644
--- a/manual/docs/html/angularCalibrationHowTo/node3.html
+++ b/manual/docs/html/angularCalibrationHowTo/node3.html
@@ -180,7 +180,7 @@ After fitting all modules you can click on the <I>Write Angular Calibration</I>
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/angularCalibrationHowTo/node4.html b/manual/docs/html/angularCalibrationHowTo/node4.html
index 374edc53d..b6874747b 100644
--- a/manual/docs/html/angularCalibrationHowTo/node4.html
+++ b/manual/docs/html/angularCalibrationHowTo/node4.html
@@ -62,7 +62,7 @@ while for the GUI the file name should be specified in the configuration file (w
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/angularCalibrationHowTo/node5.html b/manual/docs/html/angularCalibrationHowTo/node5.html
index cb21fd97c..0b42645db 100644
--- a/manual/docs/html/angularCalibrationHowTo/node5.html
+++ b/manual/docs/html/angularCalibrationHowTo/node5.html
@@ -61,11 +61,11 @@ Mathematics Department, Macquarie University, Sydney.
 The command line arguments were: <BR>
  <STRONG>latex2html</STRONG> <TT>-split 4 angularCalibrationHowTo.tex</TT>
 <P>
-The translation was initiated by Thattil Dhanya on 2017-08-22
+The translation was initiated by Thattil Dhanya on 2017-08-24
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/energyCalibrationHowTo/energyCalibrationHowTo.html b/manual/docs/html/energyCalibrationHowTo/energyCalibrationHowTo.html
index 9b4b60f36..357ae05dd 100644
--- a/manual/docs/html/energyCalibrationHowTo/energyCalibrationHowTo.html
+++ b/manual/docs/html/energyCalibrationHowTo/energyCalibrationHowTo.html
@@ -44,7 +44,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <DIV>
 
 <P ALIGN="CENTER"><STRONG>Anna Bergamaschi</STRONG></P>
-<P ALIGN="CENTER"><STRONG>August 22, 2017</STRONG></P>
+<P ALIGN="CENTER"><STRONG>August 24, 2017</STRONG></P>
 </DIV>
 
 <P>
@@ -78,7 +78,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/energyCalibrationHowTo/index.html b/manual/docs/html/energyCalibrationHowTo/index.html
index 9b4b60f36..357ae05dd 100644
--- a/manual/docs/html/energyCalibrationHowTo/index.html
+++ b/manual/docs/html/energyCalibrationHowTo/index.html
@@ -44,7 +44,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <DIV>
 
 <P ALIGN="CENTER"><STRONG>Anna Bergamaschi</STRONG></P>
-<P ALIGN="CENTER"><STRONG>August 22, 2017</STRONG></P>
+<P ALIGN="CENTER"><STRONG>August 24, 2017</STRONG></P>
 </DIV>
 
 <P>
@@ -78,7 +78,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/energyCalibrationHowTo/node1.html b/manual/docs/html/energyCalibrationHowTo/node1.html
index 8a6aee3f5..42bca70c0 100644
--- a/manual/docs/html/energyCalibrationHowTo/node1.html
+++ b/manual/docs/html/energyCalibrationHowTo/node1.html
@@ -377,7 +377,7 @@ Median of the number of counts as a function of the threshold for X-rays of 12.5
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/energyCalibrationHowTo/node2.html b/manual/docs/html/energyCalibrationHowTo/node2.html
index 3778306a6..7419c9c10 100644
--- a/manual/docs/html/energyCalibrationHowTo/node2.html
+++ b/manual/docs/html/energyCalibrationHowTo/node2.html
@@ -180,7 +180,7 @@ Acquisition GUI window to setup the threshold scan.</CAPTION>
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/energyCalibrationHowTo/node3.html b/manual/docs/html/energyCalibrationHowTo/node3.html
index e30f6f012..edd51edd3 100644
--- a/manual/docs/html/energyCalibrationHowTo/node3.html
+++ b/manual/docs/html/energyCalibrationHowTo/node3.html
@@ -184,7 +184,7 @@ Window to calibrate the modules.</CAPTION>
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/energyCalibrationHowTo/node4.html b/manual/docs/html/energyCalibrationHowTo/node4.html
index a32dee7f1..ade53625f 100644
--- a/manual/docs/html/energyCalibrationHowTo/node4.html
+++ b/manual/docs/html/energyCalibrationHowTo/node4.html
@@ -68,7 +68,7 @@ By reloading the default detector settings, the calibration coefficients will be
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/energyCalibrationHowTo/node5.html b/manual/docs/html/energyCalibrationHowTo/node5.html
index 3c4dea960..3e02de691 100644
--- a/manual/docs/html/energyCalibrationHowTo/node5.html
+++ b/manual/docs/html/energyCalibrationHowTo/node5.html
@@ -61,11 +61,11 @@ Mathematics Department, Macquarie University, Sydney.
 The command line arguments were: <BR>
  <STRONG>latex2html</STRONG> <TT>-split 4 energyCalibrationHowTo.tex</TT>
 <P>
-The translation was initiated by Thattil Dhanya on 2017-08-22
+The translation was initiated by Thattil Dhanya on 2017-08-24
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorClientDocs/acquisition.html b/manual/docs/html/slsDetectorClientDocs/acquisition.html
index e4c3cba57..29999682d 100644
--- a/manual/docs/html/slsDetectorClientDocs/acquisition.html
+++ b/manual/docs/html/slsDetectorClientDocs/acquisition.html
@@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorClientDocs/actions.html b/manual/docs/html/slsDetectorClientDocs/actions.html
index 0eeedac31..8d962b6c3 100644
--- a/manual/docs/html/slsDetectorClientDocs/actions.html
+++ b/manual/docs/html/slsDetectorClientDocs/actions.html
@@ -129,7 +129,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorClientDocs/advanced.html b/manual/docs/html/slsDetectorClientDocs/advanced.html
index 25e623fd3..853719233 100644
--- a/manual/docs/html/slsDetectorClientDocs/advanced.html
+++ b/manual/docs/html/slsDetectorClientDocs/advanced.html
@@ -54,7 +54,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorClientDocs/config.html b/manual/docs/html/slsDetectorClientDocs/config.html
index f298c34dd..b815af21c 100644
--- a/manual/docs/html/slsDetectorClientDocs/config.html
+++ b/manual/docs/html/slsDetectorClientDocs/config.html
@@ -53,7 +53,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 Data Structure</a></h2>
 <p>commands to configure detector data structure</p>
 <ul>
-<li><b> datastream </b>enables/disables the 0MQ data stream (0MQ threads created) from receiver to client. <code>Returns</code> <code></code>(int)</li>
+<li><b> externalgui </b>sets/gets external gui flag. 1 sets and enables the 0MQ data stream (0MQ threads created) from receiver to client, while 0 unsets and disables. <code>Returns</code> <code></code>(int)</li>
 </ul>
 <ul>
 <li><b>free</b> Free shared memory on the control PC</li>
@@ -251,7 +251,7 @@ Detector Parameters</a></h2>
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorClientDocs/ctb.html b/manual/docs/html/slsDetectorClientDocs/ctb.html
index b627a4074..471e8e070 100644
--- a/manual/docs/html/slsDetectorClientDocs/ctb.html
+++ b/manual/docs/html/slsDetectorClientDocs/ctb.html
@@ -114,7 +114,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorClientDocs/data.html b/manual/docs/html/slsDetectorClientDocs/data.html
index 6784d3d52..8bfba1b0f 100644
--- a/manual/docs/html/slsDetectorClientDocs/data.html
+++ b/manual/docs/html/slsDetectorClientDocs/data.html
@@ -99,7 +99,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorClientDocs/index.html b/manual/docs/html/slsDetectorClientDocs/index.html
index 94de9be63..2750e2207 100644
--- a/manual/docs/html/slsDetectorClientDocs/index.html
+++ b/manual/docs/html/slsDetectorClientDocs/index.html
@@ -83,7 +83,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorClientDocs/network.html b/manual/docs/html/slsDetectorClientDocs/network.html
index 7480a3f39..99dd143cb 100644
--- a/manual/docs/html/slsDetectorClientDocs/network.html
+++ b/manual/docs/html/slsDetectorClientDocs/network.html
@@ -108,7 +108,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorClientDocs/output.html b/manual/docs/html/slsDetectorClientDocs/output.html
index ddb972f0b..9903be6d5 100644
--- a/manual/docs/html/slsDetectorClientDocs/output.html
+++ b/manual/docs/html/slsDetectorClientDocs/output.html
@@ -75,7 +75,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorClientDocs/pages.html b/manual/docs/html/slsDetectorClientDocs/pages.html
index cbf01222c..7a0744afa 100644
--- a/manual/docs/html/slsDetectorClientDocs/pages.html
+++ b/manual/docs/html/slsDetectorClientDocs/pages.html
@@ -77,7 +77,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorClientDocs/receiver.html b/manual/docs/html/slsDetectorClientDocs/receiver.html
index 9f41f3403..a26a63c59 100644
--- a/manual/docs/html/slsDetectorClientDocs/receiver.html
+++ b/manual/docs/html/slsDetectorClientDocs/receiver.html
@@ -84,7 +84,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorClientDocs/settings.html b/manual/docs/html/slsDetectorClientDocs/settings.html
index 23d6e1284..30b9ad4a8 100644
--- a/manual/docs/html/slsDetectorClientDocs/settings.html
+++ b/manual/docs/html/slsDetectorClientDocs/settings.html
@@ -304,7 +304,7 @@ ADCs</a></h2>
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorClientDocs/test.html b/manual/docs/html/slsDetectorClientDocs/test.html
index 23f893eaa..a72af6344 100644
--- a/manual/docs/html/slsDetectorClientDocs/test.html
+++ b/manual/docs/html/slsDetectorClientDocs/test.html
@@ -96,7 +96,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorClientDocs/timing.html b/manual/docs/html/slsDetectorClientDocs/timing.html
index 8f692cd8d..8dd30c499 100644
--- a/manual/docs/html/slsDetectorClientDocs/timing.html
+++ b/manual/docs/html/slsDetectorClientDocs/timing.html
@@ -114,7 +114,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorClientHowTo/index.html b/manual/docs/html/slsDetectorClientHowTo/index.html
index 3b03aa6cd..0e7edcad0 100644
--- a/manual/docs/html/slsDetectorClientHowTo/index.html
+++ b/manual/docs/html/slsDetectorClientHowTo/index.html
@@ -43,7 +43,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <H1 ALIGN="CENTER">SLS Detector text clients manual</H1>
 <DIV>
 
-<P ALIGN="CENTER"><STRONG>August 22, 2017</STRONG></P>
+<P ALIGN="CENTER"><STRONG>August 24, 2017</STRONG></P>
 </DIV>
 
 <P>
@@ -148,7 +148,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorClientHowTo/node1.html b/manual/docs/html/slsDetectorClientHowTo/node1.html
index b869970d0..c6faa0251 100644
--- a/manual/docs/html/slsDetectorClientHowTo/node1.html
+++ b/manual/docs/html/slsDetectorClientHowTo/node1.html
@@ -123,7 +123,7 @@ For additional questions concerning the indexing of the detector, please refer t
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorClientHowTo/node2.html b/manual/docs/html/slsDetectorClientHowTo/node2.html
index 6587a2b2f..90e08c7b9 100644
--- a/manual/docs/html/slsDetectorClientHowTo/node2.html
+++ b/manual/docs/html/slsDetectorClientHowTo/node2.html
@@ -68,7 +68,7 @@ For additional questions concerning the acquisition flow, please refer to the <I
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorClientHowTo/node3.html b/manual/docs/html/slsDetectorClientHowTo/node3.html
index 5c3ce5583..afe4838f4 100644
--- a/manual/docs/html/slsDetectorClientHowTo/node3.html
+++ b/manual/docs/html/slsDetectorClientHowTo/node3.html
@@ -763,7 +763,7 @@ Debug</A>
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorClientHowTo/node4.html b/manual/docs/html/slsDetectorClientHowTo/node4.html
index 7e8c1cb0d..f1ecf7e20 100644
--- a/manual/docs/html/slsDetectorClientHowTo/node4.html
+++ b/manual/docs/html/slsDetectorClientHowTo/node4.html
@@ -110,6 +110,7 @@ For some commands, an additional argument <code>arg</code> is needed.
 <H2><A NAME="SECTION00041000000000000000">
 Standard commands</A>
 </H2>
+All the commends return two strings, where string1 is the command, string2 is teh actual returned string.
 
 <P>
 <DL>
@@ -120,10 +121,14 @@ Standard commands</A>
 <DD>Dumps the current acquisition parameters of the detector to the file fname.
 </DD>
 <DT><STRONG>settings</STRONG></DT>
-<DD>Returns the current settings of the detector.
+<DD>Returns the current settings of the detector. Returns a string 
+
+<P>
 </DD>
 <DT><STRONG>threshold</STRONG></DT>
-<DD>For photon counting detectors, returns the detector threshold in eV, -1 if undefined.
+<DD>For photon counting detectors, returns the detector threshold in eV, -1 if undefined. Returns ``threshold value_in_eV''. If it fails, the returned threshold is the old set value. 
+
+<P>
 </DD>
 <DT><STRONG>timing</STRONG></DT>
 <DD>Returns the acquisition timing mode of the detector.
@@ -139,11 +144,11 @@ Refer to the detailed documentation to understand how the different timing modes
 <DD>Returns if data are written to file (1) or not (0).
 </DD>
 <DT><STRONG>exptime</STRONG></DT>
-<DD>Returns the exposure time of a single acquisition in seconds. 
+<DD>Returns the exposure time of a single acquisition in seconds. Example: "exptime 1.000000000''
 Refer to detailed documentation to understand how the different timing modes work. 
 </DD>
 <DT><STRONG>period</STRONG></DT>
-<DD>Returns the frames period (in s). 
+<DD>Returns the frames period (in s). Example: ``period 1.000000000''
 Refer to detailed documentation to understand how the different timing modes work.
 </DD>
 <DT><STRONG>delay</STRONG></DT>
@@ -155,12 +160,12 @@ Refer to detailed documentation to understand how the different timing modes wor
 Refer to detailed documentation to understand how the different timing modes work.
 </DD>
 <DT><STRONG>frames</STRONG></DT>
-<DD>Returns the number of frames acquired sequentially per cycle (e.g. after each trigger), with the exposure time defined by exptime and the period defined by period (unless in gated mode).
+<DD>Returns the number of frames acquired sequentially per cycle (e.g. after each trigger), with the exposure time defined by exptime and the period defined by period (unless in gated mode). Returned as a string to be interpreted as an integer ``frames integer''
 Note that the total number of images is  frames times cycles.  
 Refer to detailed documentation to understand how the different timing modes work. 
 </DD>
 <DT><STRONG>cycles n</STRONG></DT>
-<DD>Returns the number of cycles (e.g. number of triggers). 
+<DD>Returns the number of cycles (e.g. number of triggers). Returned as atring to be interpreted as an integer ``cycles integer''
 Note that the total number of images is  frames times cycles. 
 Refer to detailed documentation to understand how the different timing modes work.  
 </DD>
@@ -173,7 +178,9 @@ Refer to detailed documentation to understand how the different timing modes wor
 Refer to detailed documentation to understand how the different timing modes work.
 </DD>
 <DT><STRONG>dr</STRONG></DT>
-<DD>Returns the dynamic range n (in bits) of the data for a photon counting detector. 
+<DD>Returns the dynamic range n (in bits) of the data for a photon counting detector. Returns a string that should be interpreted as an integer.
+
+<P>
 </DD>
 <DT><STRONG>flags s</STRONG></DT>
 <DD>Returns the flags set for your detector. 
@@ -549,7 +556,7 @@ Receiver -  GOTTHARD only</A>
 <DD>Returns whether the receiver in online (1) or offline (0) mode.   
 </DD>
 <DT><STRONG>framescaught</STRONG></DT>
-<DD>Returns the number of frames received.
+<DD>Returns the number of frames received. Returns: "framescaught n''
 </DD>
 <DT><STRONG>resetframescaught n</STRONG></DT>
 <DD>Sets the number of frames received to 1
@@ -808,7 +815,7 @@ Advanced settings changing the analog or digital performance of the acquisition.
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorClientHowTo/node5.html b/manual/docs/html/slsDetectorClientHowTo/node5.html
index b4838d90e..f6a10d6ff 100644
--- a/manual/docs/html/slsDetectorClientHowTo/node5.html
+++ b/manual/docs/html/slsDetectorClientHowTo/node5.html
@@ -160,7 +160,7 @@ sls_detector_put ratecorr -1
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorClientHowTo/node6.html b/manual/docs/html/slsDetectorClientHowTo/node6.html
index 7b452c707..9dd8d116d 100644
--- a/manual/docs/html/slsDetectorClientHowTo/node6.html
+++ b/manual/docs/html/slsDetectorClientHowTo/node6.html
@@ -61,11 +61,11 @@ Mathematics Department, Macquarie University, Sydney.
 The command line arguments were: <BR>
  <STRONG>latex2html</STRONG> <TT>-split 4 slsDetectorClientHowTo.tex</TT>
 <P>
-The translation was initiated by Thattil Dhanya on 2017-08-22
+The translation was initiated by Thattil Dhanya on 2017-08-24
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorClientHowTo/slsDetectorClientHowTo.html b/manual/docs/html/slsDetectorClientHowTo/slsDetectorClientHowTo.html
index 3b03aa6cd..0e7edcad0 100644
--- a/manual/docs/html/slsDetectorClientHowTo/slsDetectorClientHowTo.html
+++ b/manual/docs/html/slsDetectorClientHowTo/slsDetectorClientHowTo.html
@@ -43,7 +43,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <H1 ALIGN="CENTER">SLS Detector text clients manual</H1>
 <DIV>
 
-<P ALIGN="CENTER"><STRONG>August 22, 2017</STRONG></P>
+<P ALIGN="CENTER"><STRONG>August 24, 2017</STRONG></P>
 </DIV>
 
 <P>
@@ -148,7 +148,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorGuiHowTo/index.html b/manual/docs/html/slsDetectorGuiHowTo/index.html
index b8aec0a26..5532c393c 100644
--- a/manual/docs/html/slsDetectorGuiHowTo/index.html
+++ b/manual/docs/html/slsDetectorGuiHowTo/index.html
@@ -43,7 +43,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <H1 ALIGN="CENTER">Mythen v3.0 manual</H1>
 <DIV>
 
-<P ALIGN="CENTER"><STRONG>August 22, 2017</STRONG></P>
+<P ALIGN="CENTER"><STRONG>August 24, 2017</STRONG></P>
 </DIV>
 
 <P>
@@ -113,7 +113,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorGuiHowTo/node1.html b/manual/docs/html/slsDetectorGuiHowTo/node1.html
index ae03e32dc..a5284bb6e 100644
--- a/manual/docs/html/slsDetectorGuiHowTo/node1.html
+++ b/manual/docs/html/slsDetectorGuiHowTo/node1.html
@@ -82,7 +82,7 @@ Here you can find in brief the main things you need to know in order to start wo
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorGuiHowTo/node10.html b/manual/docs/html/slsDetectorGuiHowTo/node10.html
index cf04a83d7..0ec6c5772 100644
--- a/manual/docs/html/slsDetectorGuiHowTo/node10.html
+++ b/manual/docs/html/slsDetectorGuiHowTo/node10.html
@@ -61,7 +61,7 @@ the detector is started and the data are acquired, postprocessed and written to
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorGuiHowTo/node11.html b/manual/docs/html/slsDetectorGuiHowTo/node11.html
index e55dfb989..169f8e560 100644
--- a/manual/docs/html/slsDetectorGuiHowTo/node11.html
+++ b/manual/docs/html/slsDetectorGuiHowTo/node11.html
@@ -263,7 +263,7 @@ is used to configure the detector parameter var
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorGuiHowTo/node12.html b/manual/docs/html/slsDetectorGuiHowTo/node12.html
index 4f7e9f12c..cf6956449 100644
--- a/manual/docs/html/slsDetectorGuiHowTo/node12.html
+++ b/manual/docs/html/slsDetectorGuiHowTo/node12.html
@@ -294,7 +294,7 @@ is used to retrieve the detector parameter var
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorGuiHowTo/node13.html b/manual/docs/html/slsDetectorGuiHowTo/node13.html
index ec6fc568e..3c66f80b0 100644
--- a/manual/docs/html/slsDetectorGuiHowTo/node13.html
+++ b/manual/docs/html/slsDetectorGuiHowTo/node13.html
@@ -216,7 +216,7 @@ The configuration of the detector can either be set when startin the GUI using t
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorGuiHowTo/node14.html b/manual/docs/html/slsDetectorGuiHowTo/node14.html
index c670a7a84..da7789424 100644
--- a/manual/docs/html/slsDetectorGuiHowTo/node14.html
+++ b/manual/docs/html/slsDetectorGuiHowTo/node14.html
@@ -64,7 +64,7 @@ Please don't be too nervous clicking on start and/or stop since this is one of t
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorGuiHowTo/node15.html b/manual/docs/html/slsDetectorGuiHowTo/node15.html
index c51916421..e373bc1b9 100644
--- a/manual/docs/html/slsDetectorGuiHowTo/node15.html
+++ b/manual/docs/html/slsDetectorGuiHowTo/node15.html
@@ -181,7 +181,7 @@ Where to find some important parameters (should be set only once, then it should
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorGuiHowTo/node16.html b/manual/docs/html/slsDetectorGuiHowTo/node16.html
index e809d46ef..8df174454 100644
--- a/manual/docs/html/slsDetectorGuiHowTo/node16.html
+++ b/manual/docs/html/slsDetectorGuiHowTo/node16.html
@@ -115,7 +115,7 @@ Chose ``Add calibration step'' and select the file created prevously. The settin
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorGuiHowTo/node17.html b/manual/docs/html/slsDetectorGuiHowTo/node17.html
index fb8c5f77b..7ad5f9802 100644
--- a/manual/docs/html/slsDetectorGuiHowTo/node17.html
+++ b/manual/docs/html/slsDetectorGuiHowTo/node17.html
@@ -61,11 +61,11 @@ Mathematics Department, Macquarie University, Sydney.
 The command line arguments were: <BR>
  <STRONG>latex2html</STRONG> <TT>-split 4 slsDetectorGuiHowTo.tex</TT>
 <P>
-The translation was initiated by Thattil Dhanya on 2017-08-22
+The translation was initiated by Thattil Dhanya on 2017-08-24
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorGuiHowTo/node2.html b/manual/docs/html/slsDetectorGuiHowTo/node2.html
index 6f58afa4e..9b8e95a22 100644
--- a/manual/docs/html/slsDetectorGuiHowTo/node2.html
+++ b/manual/docs/html/slsDetectorGuiHowTo/node2.html
@@ -72,7 +72,7 @@ The complete software package is composed of several programs which can be insta
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorGuiHowTo/node3.html b/manual/docs/html/slsDetectorGuiHowTo/node3.html
index a1b6cf2aa..cb879e7a2 100644
--- a/manual/docs/html/slsDetectorGuiHowTo/node3.html
+++ b/manual/docs/html/slsDetectorGuiHowTo/node3.html
@@ -60,7 +60,7 @@ For installing the slsDetector shared and static libraries and the slsDetectorCl
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorGuiHowTo/node4.html b/manual/docs/html/slsDetectorGuiHowTo/node4.html
index 6a3b14780..93c16cb64 100644
--- a/manual/docs/html/slsDetectorGuiHowTo/node4.html
+++ b/manual/docs/html/slsDetectorGuiHowTo/node4.html
@@ -74,7 +74,7 @@ To be able to run the slsDetectorClient commands, add their location to your pat
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorGuiHowTo/node5.html b/manual/docs/html/slsDetectorGuiHowTo/node5.html
index 56754d880..d38ba15e1 100644
--- a/manual/docs/html/slsDetectorGuiHowTo/node5.html
+++ b/manual/docs/html/slsDetectorGuiHowTo/node5.html
@@ -96,7 +96,7 @@ To build you can:
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorGuiHowTo/node6.html b/manual/docs/html/slsDetectorGuiHowTo/node6.html
index 8415e29d1..ead093fbc 100644
--- a/manual/docs/html/slsDetectorGuiHowTo/node6.html
+++ b/manual/docs/html/slsDetectorGuiHowTo/node6.html
@@ -128,7 +128,7 @@ After pressing reset on the board, the board should reboot and the acqusition pr
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorGuiHowTo/node7.html b/manual/docs/html/slsDetectorGuiHowTo/node7.html
index 21a534791..b8e1cffcc 100644
--- a/manual/docs/html/slsDetectorGuiHowTo/node7.html
+++ b/manual/docs/html/slsDetectorGuiHowTo/node7.html
@@ -93,7 +93,7 @@ The default calibration files for each file will be stored in the directory acco
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorGuiHowTo/node8.html b/manual/docs/html/slsDetectorGuiHowTo/node8.html
index 8b10ef895..62602d5fb 100644
--- a/manual/docs/html/slsDetectorGuiHowTo/node8.html
+++ b/manual/docs/html/slsDetectorGuiHowTo/node8.html
@@ -94,7 +94,7 @@ slsDetectorClient</A>
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorGuiHowTo/node9.html b/manual/docs/html/slsDetectorGuiHowTo/node9.html
index 9940a909c..df7621dfd 100644
--- a/manual/docs/html/slsDetectorGuiHowTo/node9.html
+++ b/manual/docs/html/slsDetectorGuiHowTo/node9.html
@@ -106,7 +106,7 @@ There are different ways for communicationg with your detector(s).
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorGuiHowTo/slsDetectorGuiHowTo.html b/manual/docs/html/slsDetectorGuiHowTo/slsDetectorGuiHowTo.html
index b8aec0a26..5532c393c 100644
--- a/manual/docs/html/slsDetectorGuiHowTo/slsDetectorGuiHowTo.html
+++ b/manual/docs/html/slsDetectorGuiHowTo/slsDetectorGuiHowTo.html
@@ -43,7 +43,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <H1 ALIGN="CENTER">Mythen v3.0 manual</H1>
 <DIV>
 
-<P ALIGN="CENTER"><STRONG>August 22, 2017</STRONG></P>
+<P ALIGN="CENTER"><STRONG>August 24, 2017</STRONG></P>
 </DIV>
 
 <P>
@@ -113,7 +113,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-22
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectorUsersDocs/annotated.html b/manual/docs/html/slsDetectorUsersDocs/annotated.html
index 5ab1c48d6..c0b34a75e 100644
--- a/manual/docs/html/slsDetectorUsersDocs/annotated.html
+++ b/manual/docs/html/slsDetectorUsersDocs/annotated.html
@@ -63,7 +63,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/classdetectorData-members.html b/manual/docs/html/slsDetectorUsersDocs/classdetectorData-members.html
index 3a0b5916a..9326ff34c 100644
--- a/manual/docs/html/slsDetectorUsersDocs/classdetectorData-members.html
+++ b/manual/docs/html/slsDetectorUsersDocs/classdetectorData-members.html
@@ -68,7 +68,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/classdetectorData.html b/manual/docs/html/slsDetectorUsersDocs/classdetectorData.html
index b8b5532c6..3c4b1f1d5 100644
--- a/manual/docs/html/slsDetectorUsersDocs/classdetectorData.html
+++ b/manual/docs/html/slsDetectorUsersDocs/classdetectorData.html
@@ -309,7 +309,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/classes.html b/manual/docs/html/slsDetectorUsersDocs/classes.html
index 496b17b6b..db6b2a530 100644
--- a/manual/docs/html/slsDetectorUsersDocs/classes.html
+++ b/manual/docs/html/slsDetectorUsersDocs/classes.html
@@ -63,7 +63,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/classslsDetectorUsers-members.html b/manual/docs/html/slsDetectorUsersDocs/classslsDetectorUsers-members.html
index 97b6d078f..0952ed000 100644
--- a/manual/docs/html/slsDetectorUsersDocs/classslsDetectorUsers-members.html
+++ b/manual/docs/html/slsDetectorUsersDocs/classslsDetectorUsers-members.html
@@ -128,7 +128,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/classslsDetectorUsers.html b/manual/docs/html/slsDetectorUsersDocs/classslsDetectorUsers.html
index bf0e9d60f..637fa2177 100644
--- a/manual/docs/html/slsDetectorUsersDocs/classslsDetectorUsers.html
+++ b/manual/docs/html/slsDetectorUsersDocs/classslsDetectorUsers.html
@@ -2199,7 +2199,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/classslsReceiverUsers-members.html b/manual/docs/html/slsDetectorUsersDocs/classslsReceiverUsers-members.html
index 098a526a5..c263db6a6 100644
--- a/manual/docs/html/slsDetectorUsersDocs/classslsReceiverUsers-members.html
+++ b/manual/docs/html/slsDetectorUsersDocs/classslsReceiverUsers-members.html
@@ -68,7 +68,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/classslsReceiverUsers.html b/manual/docs/html/slsDetectorUsersDocs/classslsReceiverUsers.html
index a9e8b2b26..3a2f63702 100644
--- a/manual/docs/html/slsDetectorUsersDocs/classslsReceiverUsers.html
+++ b/manual/docs/html/slsDetectorUsersDocs/classslsReceiverUsers.html
@@ -325,7 +325,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/detectorData_8h.html b/manual/docs/html/slsDetectorUsersDocs/detectorData_8h.html
index 80e0f5282..060f58370 100644
--- a/manual/docs/html/slsDetectorUsersDocs/detectorData_8h.html
+++ b/manual/docs/html/slsDetectorUsersDocs/detectorData_8h.html
@@ -67,7 +67,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/detectorData_8h_source.html b/manual/docs/html/slsDetectorUsersDocs/detectorData_8h_source.html
index cc7483157..1fb581eb0 100644
--- a/manual/docs/html/slsDetectorUsersDocs/detectorData_8h_source.html
+++ b/manual/docs/html/slsDetectorUsersDocs/detectorData_8h_source.html
@@ -80,7 +80,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/files.html b/manual/docs/html/slsDetectorUsersDocs/files.html
index 6f5010c33..372023850 100644
--- a/manual/docs/html/slsDetectorUsersDocs/files.html
+++ b/manual/docs/html/slsDetectorUsersDocs/files.html
@@ -65,7 +65,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/functions.html b/manual/docs/html/slsDetectorUsersDocs/functions.html
index cd82de2fb..517e056a4 100644
--- a/manual/docs/html/slsDetectorUsersDocs/functions.html
+++ b/manual/docs/html/slsDetectorUsersDocs/functions.html
@@ -384,7 +384,7 @@ Here is a list of all class members with links to the classes they belong to:
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/functions_func.html b/manual/docs/html/slsDetectorUsersDocs/functions_func.html
index b0ae779cf..e5b49c509 100644
--- a/manual/docs/html/slsDetectorUsersDocs/functions_func.html
+++ b/manual/docs/html/slsDetectorUsersDocs/functions_func.html
@@ -350,7 +350,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/functions_vars.html b/manual/docs/html/slsDetectorUsersDocs/functions_vars.html
index 51e6842c6..b48255b0f 100644
--- a/manual/docs/html/slsDetectorUsersDocs/functions_vars.html
+++ b/manual/docs/html/slsDetectorUsersDocs/functions_vars.html
@@ -91,7 +91,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/globals.html b/manual/docs/html/slsDetectorUsersDocs/globals.html
index 8fdf6e102..421f75d16 100644
--- a/manual/docs/html/slsDetectorUsersDocs/globals.html
+++ b/manual/docs/html/slsDetectorUsersDocs/globals.html
@@ -108,7 +108,7 @@ Here is a list of all file members with links to the files they belong to:<ul>
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/globals_defs.html b/manual/docs/html/slsDetectorUsersDocs/globals_defs.html
index c4a285bd7..d34505585 100644
--- a/manual/docs/html/slsDetectorUsersDocs/globals_defs.html
+++ b/manual/docs/html/slsDetectorUsersDocs/globals_defs.html
@@ -77,7 +77,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/globals_func.html b/manual/docs/html/slsDetectorUsersDocs/globals_func.html
index 2da7b97b9..f84c2991c 100644
--- a/manual/docs/html/slsDetectorUsersDocs/globals_func.html
+++ b/manual/docs/html/slsDetectorUsersDocs/globals_func.html
@@ -90,7 +90,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/globals_vars.html b/manual/docs/html/slsDetectorUsersDocs/globals_vars.html
index 3ec65c74f..94c25d663 100644
--- a/manual/docs/html/slsDetectorUsersDocs/globals_vars.html
+++ b/manual/docs/html/slsDetectorUsersDocs/globals_vars.html
@@ -77,7 +77,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/index.html b/manual/docs/html/slsDetectorUsersDocs/index.html
index 94c1273b4..010ae01ed 100644
--- a/manual/docs/html/slsDetectorUsersDocs/index.html
+++ b/manual/docs/html/slsDetectorUsersDocs/index.html
@@ -79,7 +79,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/mainClient_8cpp.html b/manual/docs/html/slsDetectorUsersDocs/mainClient_8cpp.html
index 0fd8e211f..5bd425b95 100644
--- a/manual/docs/html/slsDetectorUsersDocs/mainClient_8cpp.html
+++ b/manual/docs/html/slsDetectorUsersDocs/mainClient_8cpp.html
@@ -158,7 +158,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/mainClient_8cpp_source.html b/manual/docs/html/slsDetectorUsersDocs/mainClient_8cpp_source.html
index c59d224d8..df818934b 100644
--- a/manual/docs/html/slsDetectorUsersDocs/mainClient_8cpp_source.html
+++ b/manual/docs/html/slsDetectorUsersDocs/mainClient_8cpp_source.html
@@ -67,8 +67,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <a name="l00041"></a>00041     pDetector-&gt;<a class="code" href="classslsDetectorUsers.html#a8aeda7c2cbc270c7f8756761823e8d95" title="Reads the configuration file -- will contain all the informations needed for the...">readConfigurationFile</a>(argv[1]);
 <a name="l00042"></a>00042     cout&lt;&lt;<span class="stringliteral">&quot;Detector configured&quot;</span> &lt;&lt; endl;
 <a name="l00043"></a>00043   }
-<a name="l00045"></a>00045     <span class="comment">//pDetector-&gt;registerDataCallback(&amp;dataCallback, NULL);</span>
-<a name="l00046"></a>00046     <span class="comment">//pDetector-&gt;enableDataStreamingFromReceiver(1);</span>
+<a name="l00045"></a>00045     pDetector-&gt;<a class="code" href="classslsDetectorUsers.html#add821d94da9b03fe500d27e4433c01f5" title="register calbback for accessing detector final data">registerDataCallback</a>(&amp;<a class="code" href="mainClient_8cpp.html#abba369ecba2066d66cc8b3b74460e778">dataCallback</a>, NULL);
+<a name="l00046"></a>00046     pDetector-&gt;<a class="code" href="classslsDetectorUsers.html#a5c85f5c94b585a1915307fa7f4bc46f6">enableDataStreamingFromReceiver</a>(1);
 <a name="l00047"></a>00047 
 <a name="l00049"></a>00049    <span class="keywordtype">int</span> status = pDetector-&gt;<a class="code" href="classslsDetectorUsers.html#ac7d0254e38b8fe783204f691a4ee05b2" title="get run status">getDetectorStatus</a>(); 
 <a name="l00050"></a>00050     <span class="keywordflow">if</span> (status  !=  0){
@@ -110,7 +110,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/mainReceiver_8cpp.html b/manual/docs/html/slsDetectorUsersDocs/mainReceiver_8cpp.html
index e20e3efd3..42e986e6b 100644
--- a/manual/docs/html/slsDetectorUsersDocs/mainReceiver_8cpp.html
+++ b/manual/docs/html/slsDetectorUsersDocs/mainReceiver_8cpp.html
@@ -56,7 +56,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <p><a href="mainReceiver_8cpp_source.html">Go to the source code of this file.</a></p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td colspan="2"><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mainReceiver_8cpp.html#aa55605484e783ee738b6f4e7b251cbee">NUM_RECEIVERS</a>&nbsp;&nbsp;&nbsp;2</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mainReceiver_8cpp.html#aa55605484e783ee738b6f4e7b251cbee">NUM_RECEIVERS</a>&nbsp;&nbsp;&nbsp;1</td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mainReceiver_8cpp.html#a2a4a8ad299b56605e3ee1ebb0950ac5c">START_TCP_PORT</a>&nbsp;&nbsp;&nbsp;1954</td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mainReceiver_8cpp.html#aeac6a4b86729a7e07100fb58600d6481">PRINT_IN_COLOR</a>(c, f,...)&nbsp;&nbsp;&nbsp;printf (&quot;\033[%dm&quot; f RESET, 30 + c+1, ##__VA_ARGS__)</td></tr>
 <tr><td colspan="2"><h2>Functions</h2></td></tr>
@@ -77,7 +77,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define NUM_RECEIVERS&nbsp;&nbsp;&nbsp;2</td>
+          <td class="memname">#define NUM_RECEIVERS&nbsp;&nbsp;&nbsp;1</td>
         </tr>
       </table>
 </div>
@@ -458,7 +458,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/mainReceiver_8cpp_source.html b/manual/docs/html/slsDetectorUsersDocs/mainReceiver_8cpp_source.html
index a4ac95ee4..012a40f2b 100644
--- a/manual/docs/html/slsDetectorUsersDocs/mainReceiver_8cpp_source.html
+++ b/manual/docs/html/slsDetectorUsersDocs/mainReceiver_8cpp_source.html
@@ -61,7 +61,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <a name="l00018"></a>00018 <span class="preprocessor">#include &lt;string&gt;</span>
 <a name="l00019"></a>00019 <span class="keyword">using namespace </span>std;
 <a name="l00020"></a>00020 
-<a name="l00021"></a><a class="code" href="mainReceiver_8cpp.html#aa55605484e783ee738b6f4e7b251cbee">00021</a> <span class="preprocessor">#define NUM_RECEIVERS   2</span>
+<a name="l00021"></a><a class="code" href="mainReceiver_8cpp.html#aa55605484e783ee738b6f4e7b251cbee">00021</a> <span class="preprocessor">#define NUM_RECEIVERS   1</span>
 <a name="l00022"></a><a class="code" href="mainReceiver_8cpp.html#a2a4a8ad299b56605e3ee1ebb0950ac5c">00022</a> <span class="preprocessor"></span><span class="preprocessor">#define START_TCP_PORT  1954</span>
 <a name="l00023"></a><a class="code" href="mainReceiver_8cpp.html#aeac6a4b86729a7e07100fb58600d6481">00023</a> <span class="preprocessor"></span><span class="preprocessor">#define PRINT_IN_COLOR(c,f, ...)        printf (&quot;\033[%dm&quot; f RESET, 30 + c+1, ##__VA_ARGS__)</span>
 <a name="l00024"></a>00024 <span class="preprocessor"></span>
@@ -225,7 +225,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/slsDetectorUsers_8h.html b/manual/docs/html/slsDetectorUsersDocs/slsDetectorUsers_8h.html
index 1142beb75..18727cab7 100644
--- a/manual/docs/html/slsDetectorUsersDocs/slsDetectorUsers_8h.html
+++ b/manual/docs/html/slsDetectorUsersDocs/slsDetectorUsers_8h.html
@@ -67,7 +67,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/slsDetectorUsers_8h_source.html b/manual/docs/html/slsDetectorUsersDocs/slsDetectorUsers_8h_source.html
index 795f3879c..1288f178d 100644
--- a/manual/docs/html/slsDetectorUsersDocs/slsDetectorUsers_8h_source.html
+++ b/manual/docs/html/slsDetectorUsersDocs/slsDetectorUsers_8h_source.html
@@ -290,7 +290,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/slsReceiverUsers_8h.html b/manual/docs/html/slsDetectorUsersDocs/slsReceiverUsers_8h.html
index 0dbee53e7..0d2cc569f 100644
--- a/manual/docs/html/slsDetectorUsersDocs/slsReceiverUsers_8h.html
+++ b/manual/docs/html/slsDetectorUsersDocs/slsReceiverUsers_8h.html
@@ -67,7 +67,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectorUsersDocs/slsReceiverUsers_8h_source.html b/manual/docs/html/slsDetectorUsersDocs/slsReceiverUsers_8h_source.html
index 730e8fa11..c225fec34 100644
--- a/manual/docs/html/slsDetectorUsersDocs/slsReceiverUsers_8h_source.html
+++ b/manual/docs/html/slsDetectorUsersDocs/slsReceiverUsers_8h_source.html
@@ -93,7 +93,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 </iframe>
 </div>
 
-<hr size="1"/><address style="text-align: right;"><small>Generated on 22 Aug 2017 by&nbsp;
+<hr size="1"/><address style="text-align: right;"><small>Generated on 24 Aug 2017 by&nbsp;
 <a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.6.1 </small></address>
 </body>
diff --git a/manual/docs/html/slsDetectors-FAQ/img36.png b/manual/docs/html/slsDetectors-FAQ/img36.png
index 396c93102..97230c6d2 100644
Binary files a/manual/docs/html/slsDetectors-FAQ/img36.png and b/manual/docs/html/slsDetectors-FAQ/img36.png differ
diff --git a/manual/docs/html/slsDetectors-FAQ/index.html b/manual/docs/html/slsDetectors-FAQ/index.html
index e773fb4e3..554fca05b 100644
--- a/manual/docs/html/slsDetectors-FAQ/index.html
+++ b/manual/docs/html/slsDetectors-FAQ/index.html
@@ -53,7 +53,7 @@ Frequently Asked Questions">
 Frequently Asked Questions</H1>
 <P ALIGN=CENTER><STRONG>Anna Bergamaschi</STRONG>
 </P>
-<BR><P ALIGN=CENTER><B>Date:</B> August 23, 2017</P>
+<BR><P ALIGN=CENTER><B>Date:</B> August 24, 2017</P>
 
 <HR>
 
@@ -244,7 +244,7 @@ Frequently Asked Questions</H1>
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node1.html b/manual/docs/html/slsDetectors-FAQ/node1.html
index b088f33f6..6fc184770 100644
--- a/manual/docs/html/slsDetectors-FAQ/node1.html
+++ b/manual/docs/html/slsDetectors-FAQ/node1.html
@@ -198,7 +198,7 @@ Contents</A>
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node10.html b/manual/docs/html/slsDetectors-FAQ/node10.html
index 24131ab6c..a7c09c181 100644
--- a/manual/docs/html/slsDetectors-FAQ/node10.html
+++ b/manual/docs/html/slsDetectors-FAQ/node10.html
@@ -195,7 +195,7 @@ Read Out Trigger mode: the external trigger signal defines the beginning of the
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node11.html b/manual/docs/html/slsDetectors-FAQ/node11.html
index d097051b4..ff5d4bf1c 100644
--- a/manual/docs/html/slsDetectors-FAQ/node11.html
+++ b/manual/docs/html/slsDetectors-FAQ/node11.html
@@ -103,7 +103,7 @@ After the configuration, the synchronization of the controllers will be complete
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node12.html b/manual/docs/html/slsDetectors-FAQ/node12.html
index 0bf9c0765..4a16c2ea8 100644
--- a/manual/docs/html/slsDetectors-FAQ/node12.html
+++ b/manual/docs/html/slsDetectors-FAQ/node12.html
@@ -103,7 +103,7 @@ A simple high-level solution in case you need to maintain the software for sever
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node13.html b/manual/docs/html/slsDetectors-FAQ/node13.html
index 2875cfba8..179b75361 100644
--- a/manual/docs/html/slsDetectors-FAQ/node13.html
+++ b/manual/docs/html/slsDetectors-FAQ/node13.html
@@ -187,7 +187,7 @@ JUNGFRAU</A>
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node14.html b/manual/docs/html/slsDetectors-FAQ/node14.html
index 4a8c34bfd..18f62ce89 100644
--- a/manual/docs/html/slsDetectors-FAQ/node14.html
+++ b/manual/docs/html/slsDetectors-FAQ/node14.html
@@ -81,7 +81,7 @@ General questions about detectors</A>
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node15.html b/manual/docs/html/slsDetectors-FAQ/node15.html
index 1538f78d2..a5b8d7802 100644
--- a/manual/docs/html/slsDetectors-FAQ/node15.html
+++ b/manual/docs/html/slsDetectors-FAQ/node15.html
@@ -203,7 +203,7 @@ Settings to be chosen for the MYTHEN detector as a function of the X-ray energy
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node16.html b/manual/docs/html/slsDetectors-FAQ/node16.html
index aa460d167..8feaf266d 100644
--- a/manual/docs/html/slsDetectors-FAQ/node16.html
+++ b/manual/docs/html/slsDetectors-FAQ/node16.html
@@ -105,7 +105,7 @@ In case the board has some memory that can be accessed by the hardware, this is
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node17.html b/manual/docs/html/slsDetectors-FAQ/node17.html
index 454c83b96..531becf87 100644
--- a/manual/docs/html/slsDetectors-FAQ/node17.html
+++ b/manual/docs/html/slsDetectors-FAQ/node17.html
@@ -109,7 +109,7 @@ Single photon counting detectors</A>
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node18.html b/manual/docs/html/slsDetectors-FAQ/node18.html
index eea6add94..386f8a8e1 100644
--- a/manual/docs/html/slsDetectors-FAQ/node18.html
+++ b/manual/docs/html/slsDetectors-FAQ/node18.html
@@ -146,7 +146,7 @@ Plot indicating the reccomended choice of detector settings as a function of the
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node19.html b/manual/docs/html/slsDetectors-FAQ/node19.html
index 55b9de60b..275ccea24 100644
--- a/manual/docs/html/slsDetectors-FAQ/node19.html
+++ b/manual/docs/html/slsDetectors-FAQ/node19.html
@@ -305,7 +305,7 @@ Example of data from a sample emitting fluorescent light and detector threshold
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node2.html b/manual/docs/html/slsDetectors-FAQ/node2.html
index db855efae..9f41a1cdd 100644
--- a/manual/docs/html/slsDetectors-FAQ/node2.html
+++ b/manual/docs/html/slsDetectors-FAQ/node2.html
@@ -111,7 +111,7 @@ SLS Detectors Software</A>
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node20.html b/manual/docs/html/slsDetectors-FAQ/node20.html
index bdec53e65..fb917fa14 100644
--- a/manual/docs/html/slsDetectors-FAQ/node20.html
+++ b/manual/docs/html/slsDetectors-FAQ/node20.html
@@ -171,7 +171,7 @@ Sketch of the experimental setup for a dynamic acquisition of the flat field.</C
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node21.html b/manual/docs/html/slsDetectors-FAQ/node21.html
index 6c82df9e0..61e8d4a99 100644
--- a/manual/docs/html/slsDetectors-FAQ/node21.html
+++ b/manual/docs/html/slsDetectors-FAQ/node21.html
@@ -258,7 +258,7 @@ The authomatic loading of energy-specific trim files is not yet implemented.
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node22.html b/manual/docs/html/slsDetectors-FAQ/node22.html
index 3f8ba8aaa..3e19afe74 100644
--- a/manual/docs/html/slsDetectors-FAQ/node22.html
+++ b/manual/docs/html/slsDetectors-FAQ/node22.html
@@ -179,7 +179,7 @@ Reading and analyzing the data takes some time, but, after a while, a canvas sho
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node3.html b/manual/docs/html/slsDetectors-FAQ/node3.html
index 2e1ea4e41..326d79d33 100644
--- a/manual/docs/html/slsDetectors-FAQ/node3.html
+++ b/manual/docs/html/slsDetectors-FAQ/node3.html
@@ -110,7 +110,7 @@ The class slsDetectorUsers can be used as API from your acquisition software (se
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node4.html b/manual/docs/html/slsDetectors-FAQ/node4.html
index 58907ce3b..c3fcbca7e 100644
--- a/manual/docs/html/slsDetectors-FAQ/node4.html
+++ b/manual/docs/html/slsDetectors-FAQ/node4.html
@@ -158,7 +158,7 @@ You will need to configure more than one detector, only in case you want to oper
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node5.html b/manual/docs/html/slsDetectors-FAQ/node5.html
index 753f918f7..d3845c9a4 100644
--- a/manual/docs/html/slsDetectors-FAQ/node5.html
+++ b/manual/docs/html/slsDetectors-FAQ/node5.html
@@ -133,7 +133,7 @@ The client will take care of communicating with the data receiver and the detect
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node6.html b/manual/docs/html/slsDetectors-FAQ/node6.html
index 51cd4af1c..ca141507d 100644
--- a/manual/docs/html/slsDetectors-FAQ/node6.html
+++ b/manual/docs/html/slsDetectors-FAQ/node6.html
@@ -143,7 +143,7 @@ It must contain the subdirectories <code>dynamicgain</code>, <code>gain1</code>,
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node7.html b/manual/docs/html/slsDetectors-FAQ/node7.html
index b430ce8f3..57a7518fb 100644
--- a/manual/docs/html/slsDetectors-FAQ/node7.html
+++ b/manual/docs/html/slsDetectors-FAQ/node7.html
@@ -71,7 +71,7 @@ The configuration files look different for the different detector types. Example
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node8.html b/manual/docs/html/slsDetectors-FAQ/node8.html
index 3d3bf8e82..e9453483e 100644
--- a/manual/docs/html/slsDetectors-FAQ/node8.html
+++ b/manual/docs/html/slsDetectors-FAQ/node8.html
@@ -80,7 +80,7 @@ where:
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/node9.html b/manual/docs/html/slsDetectors-FAQ/node9.html
index 3b63fad7c..cfef5758b 100644
--- a/manual/docs/html/slsDetectors-FAQ/node9.html
+++ b/manual/docs/html/slsDetectors-FAQ/node9.html
@@ -337,7 +337,7 @@ where i si the <I>file index</I> and p is the <I>stop script parameter</I>.
 <!--End of Navigation Panel-->
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/html/slsDetectors-FAQ/slsDetectors-FAQ.html b/manual/docs/html/slsDetectors-FAQ/slsDetectors-FAQ.html
index e773fb4e3..554fca05b 100644
--- a/manual/docs/html/slsDetectors-FAQ/slsDetectors-FAQ.html
+++ b/manual/docs/html/slsDetectors-FAQ/slsDetectors-FAQ.html
@@ -53,7 +53,7 @@ Frequently Asked Questions">
 Frequently Asked Questions</H1>
 <P ALIGN=CENTER><STRONG>Anna Bergamaschi</STRONG>
 </P>
-<BR><P ALIGN=CENTER><B>Date:</B> August 23, 2017</P>
+<BR><P ALIGN=CENTER><B>Date:</B> August 24, 2017</P>
 
 <HR>
 
@@ -244,7 +244,7 @@ Frequently Asked Questions</H1>
 <BR><HR>
 <ADDRESS>
 Thattil Dhanya
-2017-08-23
+2017-08-24
 </ADDRESS>
 </BODY>
 </HTML>
diff --git a/manual/docs/pdf/angularCalibrationHowTo.pdf b/manual/docs/pdf/angularCalibrationHowTo.pdf
index e2edd5a86..f56a7f1d4 100644
Binary files a/manual/docs/pdf/angularCalibrationHowTo.pdf and b/manual/docs/pdf/angularCalibrationHowTo.pdf differ
diff --git a/manual/docs/pdf/energyCalibrationHowTo.pdf b/manual/docs/pdf/energyCalibrationHowTo.pdf
index 889fbcd4a..48e153978 100644
Binary files a/manual/docs/pdf/energyCalibrationHowTo.pdf and b/manual/docs/pdf/energyCalibrationHowTo.pdf differ
diff --git a/manual/docs/pdf/slsDetectorClientDocs.pdf b/manual/docs/pdf/slsDetectorClientDocs.pdf
index f21b1d744..1cfc2012f 100644
Binary files a/manual/docs/pdf/slsDetectorClientDocs.pdf and b/manual/docs/pdf/slsDetectorClientDocs.pdf differ
diff --git a/manual/docs/pdf/slsDetectorClientHowTo.pdf b/manual/docs/pdf/slsDetectorClientHowTo.pdf
index 4ea86cddf..84b66074f 100644
Binary files a/manual/docs/pdf/slsDetectorClientHowTo.pdf and b/manual/docs/pdf/slsDetectorClientHowTo.pdf differ
diff --git a/manual/docs/pdf/slsDetectorGuiHowTo.pdf b/manual/docs/pdf/slsDetectorGuiHowTo.pdf
index 0ce8b75aa..0da853a58 100644
Binary files a/manual/docs/pdf/slsDetectorGuiHowTo.pdf and b/manual/docs/pdf/slsDetectorGuiHowTo.pdf differ
diff --git a/manual/docs/pdf/slsDetectorInstall.pdf b/manual/docs/pdf/slsDetectorInstall.pdf
index ba2e2ad29..4af5b6500 100644
Binary files a/manual/docs/pdf/slsDetectorInstall.pdf and b/manual/docs/pdf/slsDetectorInstall.pdf differ
diff --git a/manual/docs/pdf/slsDetectorUsersDocs.pdf b/manual/docs/pdf/slsDetectorUsersDocs.pdf
index 6e5da910e..d60b06cea 100644
Binary files a/manual/docs/pdf/slsDetectorUsersDocs.pdf and b/manual/docs/pdf/slsDetectorUsersDocs.pdf differ
diff --git a/manual/docs/pdf/slsDetectors-FAQ.pdf b/manual/docs/pdf/slsDetectors-FAQ.pdf
index 73c62f1cf..7f308b5e7 100644
Binary files a/manual/docs/pdf/slsDetectors-FAQ.pdf and b/manual/docs/pdf/slsDetectors-FAQ.pdf differ
diff --git a/manual/manual-api/Makefile b/manual/manual-api/Makefile
index 81090292f..d97793ea6 100644
--- a/manual/manual-api/Makefile
+++ b/manual/manual-api/Makefile
@@ -1,9 +1,9 @@
 INCLUDES	=   -I . 
 SRC_DET		= 	mainClient.cpp 	
 SRC_REC		=   mainReceiver.cpp
-LIBDIR		=   ../../bin
-LDFLAG_DET 	=	-L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread
-LDFLAG_REC 	=	-L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread
+LIBDIR		=   ../../build/bin
+LDFLAG_DET 	=	-I. -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread -lrt -L. -lzmq
+LDFLAG_REC 	=	-I. -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread -lrt -L. -lzmq
 DESTDIR		?=	../docs
 
 
diff --git a/manual/manual-api/detReceiver b/manual/manual-api/detReceiver
index dca3dbbe2..7d4c3c69e 100755
Binary files a/manual/manual-api/detReceiver and b/manual/manual-api/detReceiver differ
diff --git a/manual/manual-api/detUser b/manual/manual-api/detUser
index e52c5ad17..280e1a4bb 100755
Binary files a/manual/manual-api/detUser and b/manual/manual-api/detUser differ
diff --git a/manual/manual-api/libzmq.a b/manual/manual-api/libzmq.a
new file mode 120000
index 000000000..2ecd6f21c
--- /dev/null
+++ b/manual/manual-api/libzmq.a
@@ -0,0 +1 @@
+../../slsReceiverSoftware/include/libzmq.a
\ No newline at end of file
diff --git a/manual/manual-api/mainClient.cpp b/manual/manual-api/mainClient.cpp
index e7310e1a3..70d75199a 100644
--- a/manual/manual-api/mainClient.cpp
+++ b/manual/manual-api/mainClient.cpp
@@ -42,8 +42,8 @@ int main(int argc,  char **argv) {
     cout<<"Detector configured" << endl;
   }
     /** registering data callback */
-    //pDetector->registerDataCallback(&dataCallback, NULL);
-    //pDetector->enableDataStreamingFromReceiver(1);
+    pDetector->registerDataCallback(&dataCallback, NULL);
+    pDetector->enableDataStreamingFromReceiver(1);
 
     /** checking detector status and exiting if not idle */
    int status = pDetector->getDetectorStatus(); 
diff --git a/manual/manual-api/mainReceiver.cpp b/manual/manual-api/mainReceiver.cpp
index 69cda2fa5..70217f90d 100644
--- a/manual/manual-api/mainReceiver.cpp
+++ b/manual/manual-api/mainReceiver.cpp
@@ -18,7 +18,7 @@
 #include <string>
 using namespace std;
 
-#define NUM_RECEIVERS 	2
+#define NUM_RECEIVERS 	1
 #define START_TCP_PORT	1954
 #define PRINT_IN_COLOR(c,f, ...) 	printf ("\033[%dm" f RESET, 30 + c+1, ##__VA_ARGS__)
 
diff --git a/manual/manual-api/zmq.h b/manual/manual-api/zmq.h
new file mode 120000
index 000000000..f2002f1d8
--- /dev/null
+++ b/manual/manual-api/zmq.h
@@ -0,0 +1 @@
+../../slsReceiverSoftware/include/zmq.h
\ No newline at end of file
diff --git a/serverBin/gotthardDetectorServer b/serverBin/gotthardDetectorServer
deleted file mode 120000
index 81734036a..000000000
--- a/serverBin/gotthardDetectorServer
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.1
\ No newline at end of file
diff --git a/serverBin/gotthardDetectorServerv3.0.0.5 b/serverBin/gotthardDetectorServerv3.0.0.5
new file mode 120000
index 000000000..98922ce43
--- /dev/null
+++ b/serverBin/gotthardDetectorServerv3.0.0.5
@@ -0,0 +1 @@
+../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.5
\ No newline at end of file