diff --git a/.gitignore b/.gitignore
index c70f6bc8b..e110a9b3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 slsDetectorGui
 slsDetectorSoftware
 slsReceiverSoftware
+.cproject
+.project
diff --git a/Makefile b/Makefile
index e8ee2fb5a..bfeeeeb03 100644
--- a/Makefile
+++ b/Makefile
@@ -9,65 +9,71 @@ DOCDIR	?=	$(INSTALLROOT)/docs
 LIBDIR	?=	$(INSTALLROOT)/bin
 INCDIR	?=	$(INSTALLROOT)/include
 
-WD		=	$(shell pwd)
-LIBRARYDIR	=	$(WD)/slsDetectorSoftware
-CLIENTDIR	=	$(LIBRARYDIR)/slsDetectorClient
-GUIDIR		=	$(WD)/slsDetectorGui
-RECEIVERDIR	=	$(LIBRARYDIR)/slsReceiver
-CALWIZDIR	=	$(WD)/calibrationWizards
-MANDIR		=	$(WD)/manual
-CALIBDIR	=	$(WD)/slsDetectorCalibration
+WD				=	$(shell pwd)
+LIBRARYDIR		=	$(WD)/slsDetectorSoftware
+LIBRARYRXRDIR 	= 	$(WD)/slsReceiverSoftware
+CLIENTDIR		=	$(LIBRARYDIR)/slsDetectorClient
+GUIDIR			=	$(WD)/slsDetectorGui
+RECEIVERDIR		=	$(LIBRARYRXRDIR)/slsReceiver
+CALWIZDIR		=	$(WD)/calibrationWizards
+MANDIR			=	$(WD)/manual
+CALIBDIR		=	$(LIBRARYRXRDIR)/slsDetectorCalibration
 
 
-INCLUDES=-I. -I$(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/MySocketTCP -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/slsDetectorUtils -I$(LIBRARYDIR)/slsDetectorCommand -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYDIR)/slsReceiver -I$(CALIBDIR) -I$(ASM)
+INCLUDES=-I. -I$(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYRXRDIR)/MySocketTCP -I$(LIBRARYDIR)/usersFunctions -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/slsDetectorUtils -I$(LIBRARYDIR)/slsDetectorCommand -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/slsReceiverInterface  -I$(LIBRARYRXRDIR)/includes -I$(ASM)
+INCLUDESRXR=-I. -I$(LIBRARYRXRDIR)/MySocketTCP -I$(LIBRARYRXRDIR)/includes -I$(RECEIVERDIR)  -I$(RECEIVERDIR)/eigerReceiver -I$(CALIBDIR) -I$(ASM) #-I$(LIBRARYDIR)/slsReceiverInterface
 
+.PHONY: all nonstatic static lib libreceiver textclient receiver gui stextclient sreceiver
 
-.PHONY: all nonstatic static lib textclient receiver gui stextclient sreceiver
+all: lib textclient  receiver gui 
 
-all: lib  textclient  receiver gui 
+nonstatic: lib libreceiver textclient receiver  gui 
 
-nonstatic: lib  textclient receiver  gui 
+static: lib  libreceiver stextclient sreceiver gui 
 
-static: lib  stextclient sreceiver gui 
 
 lib:
 	cd $(LIBRARYDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(LIBDIR)' INCLUDES='$(INCLUDES)'
+	
+libreceiver:
+	cd $(LIBRARYRXRDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(LIBDIR)' INCLUDES='$(INCLUDESRXR)'
+
 
 stextclient: slsDetectorClient_static
 
 slsDetectorClient: textclient
 
 slsDetectorClient_static: lib
-	cd  $(CLIENTDIR) && $(MAKE) static_clients FLAGS='$(FLAGS)' LIBS='$(LDFLAG)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' INCLUDES='$(INCLUDES)'
-
+	cd  $(CLIENTDIR) && $(MAKE) static_clients FLAGS='$(FLAGS)' LIBS='$(LDFLAGDET)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' INCLUDES='$(INCLUDES)'
 
 textclient: lib
-	cd  $(CLIENTDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)'  LIBDIR='$(LIBDIR)' LIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)'
+	cd  $(CLIENTDIR) && $(MAKE) FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)'  LIBDIR='$(LIBDIR)' LIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)'
+
 
 slsReceiver: receiver
 
 slsReceiver_static: receiver
 
-receiver: lib
-	cd  $(RECEIVERDIR) && $(MAKE) receiver FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)'  LIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)'
+receiver: libreceiver
+	cd  $(RECEIVERDIR) && $(MAKE) receiver FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)'  LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)'
+
+sreceiver: libreceiver
+	cd  $(RECEIVERDIR) && $(MAKE)  static_receiver FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)'  LIBS='$(LDFLAGRXR)' INCLUDES='$(INCLUDESRXR)'
 
-sreceiver: lib
-	cd  $(RECEIVERDIR) && $(MAKE)  static_receiver FLAGS='$(FLAGS)' DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)'  LIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)'
 
 
 slsDetectorGUI: lib
-	cd  $(GUIDIR) && $(MAKE) DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' INCLUDES='$(INCLUDES)' 
+	cd  $(GUIDIR) && $(MAKE) DESTDIR='$(BINDIR)' LIBDIR='$(LIBDIR)' INCLUDES='$(INCLUDES)' LDFLAGDET='-L$(LIBDIR) -lSlsDetector'  
 
 
 calWiz: 
-	cd  $(CALWIZDIR) && $(MAKE)  FLAGS=$(FLAGS)  LDFLAG=$(LDFLAG) DESTDIR=$(BINDIR) INCLUDES=$(INCLUDES)
+	cd  $(CALWIZDIR) && $(MAKE)  FLAGS=$(FLAGS)  LDFLAGDET=$(LDFLAGDET) DESTDIR=$(BINDIR) INCLUDES=$(INCLUDES)
 
 
 
 gui: slsDetectorGUI
 
 
-
 doc:
 	$(shell test -d $(DOCDIR) || mkdir -p $(DOCDIR))
 	cd manual && make all DESTDIR=$(DOCDIR)
@@ -80,12 +86,12 @@ htmldoc:
 
 clean:
 	cd $(BINDIR) && rm -rf sls_detector_* slsDetectorGui slsReceiver angularCalibrationWizard energyCalibrationWizard 
-	cd $(LIBDIR) && rm -rf libSlsDetector.so libSlsDetector.a
-	cd $(LIBRARYDIR) && $(MAKE) clean
+	cd $(LIBDIR) && rm -rf libSlsDetector.so libSlsDetector.a libSlsReceiver.so libSlsReceiver.a 
+	cd $(LIBRARYDIR) && $(MAKE) clean 
+	cd $(LIBRARYRXRDIR) && $(MAKE) clean 
 	cd $(CLIENTDIR) && $(MAKE) clean
-	cd $(RECEIVERDIR) && $(MAKE) clean	
 	cd $(GUIDIR) && $(MAKE) clean
-	cd  $(CALWIZDIR) && $(MAKE) clean	
+	cd $(CALWIZDIR) && $(MAKE) clean
 	cd manual && $(MAKE) clean
 	cd $(DOCDIR) && rm -rf * 
 
@@ -113,18 +119,20 @@ confinstall:
 
 install_lib: 
 	make lib;\
+	make libreceiver; \
 	make textclient; \
 	make slsReceiver; \
 	make doc; \
 	make htmldoc; \
-	cd $(LIBRARYDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR);
-
+	cd $(LIBRARYDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR); \
+	cd $(LIBRARYRXRDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR);
+	
 install: 
 	make install_lib; \
 	make gui; \
 	make calWiz; \
-	cd $(LIBRARYDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR);
-
+	cd $(LIBRARYDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR);\
+	cd $(LIBRARYRXRDIR) && $(MAKE) install_inc DESTDIR=$(INCDIR);
 
 conf:
 	set -e; \
@@ -140,6 +148,7 @@ help:
 	@echo "Targets:"
 	@echo "make all 		compile library,  text clients, data reciever"
 	@echo "make lib 		compile library"
+	@echo "make libreceiver 		compile receiver library"
 	@echo "make textclient		compile the slsDetectorClient dynamically linking the libraries"
 	@echo "make stextclient 		compile slsDetectorClient statically linking the libraries"
 	@echo "make receiver		compile the slsReciever dynamically linking the libraries"
diff --git a/Makefile.include b/Makefile.include
index 799037b21..ba13f7364 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -5,7 +5,8 @@
 CC = g++
 CXX = $(CC)
 ASM=$(shell echo "/lib/modules/`uname -r`/build/include")
-LDFLAG = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -lpthread
+LDFLAGDET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -lpthread
+LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -lpthread
 FLAGS= -Wall -DVERBOSE 
 
 ##############################################################
@@ -26,7 +27,7 @@ JSONBOXDIR = /home/sala/Programs/JsonBox-ubuntu_13.10-64bit
 EIGERFLAGS = -L$(POCODIR)/lib -Wl,-rpath=$(POCODIR)/lib -I$(POCODIR)/include -L$(JSONBOXDIR) -Wl,-rpath=$(JSONBOXDIR)/lib -I$(JSONBOXDIR)/include -lPocoNet -lPocoFoundation -lJsonBox
 
 ifeq ($(EIGERSLS),yes)
-     LDFLAG = -L$(LIBDIR) -lSlsDetector $(EIGERFLAGS) -DEIGERSLS
+     LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver $(EIGERFLAGS) -DEIGERSLS
 endif
 
 
@@ -40,7 +41,7 @@ ROOTSLS = no
 ROOTFLAGS = $(shell root-config --cflags --glibs) -DMYROOT1   #-DALLFILE_DEBUG #-DMYROOT1 
 
 ifeq ($(ROOTSLS),yes)
-     LDFLAG = -L$(LIBDIR) -lSlsDetector $(ROOTFLAGS) -DROOTSLS
+     LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver $(ROOTFLAGS) -DROOTSLS
 endif
 
 
diff --git a/examples/receiver.config b/examples/receiver.config
new file mode 100644
index 000000000..fa4586e14
--- /dev/null
+++ b/examples/receiver.config
@@ -0,0 +1 @@
+dataport 1955
diff --git a/updateSvnVersion.sh b/updateSvnVersion.sh
index 4517041f3..27efb7f21 100755
--- a/updateSvnVersion.sh
+++ b/updateSvnVersion.sh
@@ -3,12 +3,14 @@
 #folders
 MAINDIR=slsDetectorsPackage
 LIBDIR=slsDetectorSoftware
+RXRDIR=slsReceiverSoftware
 GUIDIR=slsDetectorGui
 CALWIZDIR=calibrationWizards
 
 SVNPATH=file:///afs/psi.ch/project/sls_det_software/svn
 MAINDIRSVN=$SVNPATH/$MAINDIR
 LIBDIRSVN=$SVNPATH/$LIBDIR
+RXRDIRSVN=$SVNPATH/$RXRDIR
 GUIDIRSVN=$SVNPATH/$GUIDIR
 CALWIZSVN=$SVNPATH/$GUIDIR
 
@@ -17,6 +19,7 @@ CALWIZSVN=$SVNPATH/$GUIDIR
 #svn export --force $MAINDIRSVN
 #cd $MAINDIR
 #svn export --force  $LIBDIRSVN
+#svn export --force  $RXRDIRSVN
 #svn export --force  $GUIDIRSVN
 #svn export --force  $CALWIZSVN
 
@@ -38,8 +41,8 @@ svn info $LIBDIRSVN/eigerDetectorServer > $LIBDIR/eigerDetectorServer/svnInfo.tx
 ./genVersionHeader.sh $LIBDIR/eigerDetectorServer/svnInfo.txt $LIBDIR/eigerDetectorServer/svnInfoEigerTmp.h $LIBDIR/eigerDetectorServer/svnInfoEiger.h 
 
 
-svn info $LIBDIRSVN/slsReceiver > $LIBDIR/slsReceiver/svnInfo.txt
-./genVersionHeader.sh $LIBDIR/slsReceiver/svnInfo.txt $LIBDIR/slsReceiver/svnInfoReceiverTmp.h $LIBDIR/slsReceiver/svnInfoReceiver.h 
+svn info $RXRDIRSVN/includes > $RXRDIR/includes/svnInfo.txt
+./genVersionHeader.sh $RXRDIR/includes/svnInfo.txt $RXRDIR/includes/svnInfoReceiverTmp.h $RXRDIR/includes/svnInfoReceiver.h 
 
 svn info $GUIDIRSVN > $GUIDIR/svnInfo.txt
 ./genVersionHeader.sh $GUIDIR/svnInfo.txt $GUIDIR/include/svnInfoGuiTmp.h $GUIDIR/include/svnInfoGui.h