Index: branches/FEPSimulator/nbproject/Makefile-Debug.mk
===================================================================
--- branches/FEPSimulator/nbproject/Makefile-Debug.mk	(revision 80)
+++ branches/FEPSimulator/nbproject/Makefile-Debug.mk	(revision 82)
@@ -22,6 +22,6 @@
 
 # Macros
-CND_PLATFORM=GNU-Linux-x86
-CND_DLIB_EXT=so
+CND_PLATFORM=GNU-MacOSX
+CND_DLIB_EXT=dylib
 CND_CONF=Debug
 CND_DISTDIR=dist
@@ -37,5 +37,5 @@
 OBJECTFILES= \
 	${OBJECTDIR}/DataPacker.o \
-	${OBJECTDIR}/FEPClient.o \
+	${OBJECTDIR}/FEPSim.o \
 	${OBJECTDIR}/NetworkReader.o \
 	${OBJECTDIR}/fep_clnt.o \
@@ -57,15 +57,15 @@
 
 # Link Libraries and Options
-LDLIBSOPTIONS=tinyxml/tinyxml.a
+LDLIBSOPTIONS=tinyxml/libosxtinyxml.a
 
 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
-	"${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client
+	"${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
 
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client: tinyxml/tinyxml.a
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: tinyxml/libosxtinyxml.a
 
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client: ${OBJECTFILES}
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ${OBJECTFILES}
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
-	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client ${OBJECTFILES} ${LDLIBSOPTIONS}
+	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator ${OBJECTFILES} ${LDLIBSOPTIONS}
 
 ${OBJECTDIR}/DataPacker.o: DataPacker.cpp 
@@ -74,8 +74,8 @@
 	$(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/DataPacker.o DataPacker.cpp
 
-${OBJECTDIR}/FEPClient.o: FEPClient.cpp 
+${OBJECTDIR}/FEPSim.o: FEPSim.cpp 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
-	$(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPClient.o FEPClient.cpp
+	$(COMPILE.cc) -g -Itinyxml -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim.o FEPSim.cpp
 
 ${OBJECTDIR}/NetworkReader.o: NetworkReader.cpp 
@@ -100,5 +100,5 @@
 .clean-conf: ${CLEAN_SUBPROJECTS}
 	${RM} -r ${CND_BUILDDIR}/${CND_CONF}
-	${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client
+	${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
 
 # Subprojects
Index: branches/FEPSimulator/nbproject/Makefile-variables.mk
===================================================================
--- branches/FEPSimulator/nbproject/Makefile-variables.mk	(revision 77)
+++ branches/FEPSimulator/nbproject/Makefile-variables.mk	(revision 82)
@@ -8,11 +8,11 @@
 CND_DISTDIR=dist
 # Debug configuration
-CND_PLATFORM_Debug=GNU-Linux-x86
-CND_ARTIFACT_DIR_Debug=dist/Debug/GNU-Linux-x86
-CND_ARTIFACT_NAME_Debug=fep_rpc_client
-CND_ARTIFACT_PATH_Debug=dist/Debug/GNU-Linux-x86/fep_rpc_client
-CND_PACKAGE_DIR_Debug=dist/Debug/GNU-Linux-x86/package
-CND_PACKAGE_NAME_Debug=feprpcclient.tar
-CND_PACKAGE_PATH_Debug=dist/Debug/GNU-Linux-x86/package/feprpcclient.tar
+CND_PLATFORM_Debug=GNU-MacOSX
+CND_ARTIFACT_DIR_Debug=dist/Debug/GNU-MacOSX
+CND_ARTIFACT_NAME_Debug=fepsimulator
+CND_ARTIFACT_PATH_Debug=dist/Debug/GNU-MacOSX/fepsimulator
+CND_PACKAGE_DIR_Debug=dist/Debug/GNU-MacOSX/package
+CND_PACKAGE_NAME_Debug=fepsimulator.tar
+CND_PACKAGE_PATH_Debug=dist/Debug/GNU-MacOSX/package/fepsimulator.tar
 # Release configuration
 CND_PLATFORM_Release=GNU-Linux-x86
Index: branches/FEPSimulator/nbproject/configurations.xml
===================================================================
--- branches/FEPSimulator/nbproject/configurations.xml	(revision 80)
+++ branches/FEPSimulator/nbproject/configurations.xml	(revision 82)
@@ -6,5 +6,5 @@
                    projectFiles="true">
       <itemPath>DataPacker.h</itemPath>
-      <itemPath>FEPClient.h</itemPath>
+      <itemPath>FEPSim.h</itemPath>
       <itemPath>NetworkReader.h</itemPath>
       <itemPath>fep.h</itemPath>
@@ -19,5 +19,5 @@
                    projectFiles="true">
       <itemPath>DataPacker.cpp</itemPath>
-      <itemPath>FEPClient.cpp</itemPath>
+      <itemPath>FEPSim.cpp</itemPath>
       <itemPath>NetworkReader.cpp</itemPath>
       <itemPath>fep_clnt.c</itemPath>
@@ -52,5 +52,5 @@
         <linkerTool>
           <linkerLibItems>
-            <linkerLibFileItem>tinyxml/tinyxml.a</linkerLibFileItem>
+            <linkerLibFileItem>tinyxml/libosxtinyxml.a</linkerLibFileItem>
           </linkerLibItems>
         </linkerTool>
@@ -60,7 +60,7 @@
       <item path="DataPacker.h" ex="false" tool="3" flavor2="0">
       </item>
-      <item path="FEPClient.cpp" ex="false" tool="1" flavor2="0">
+      <item path="FEPSim.cpp" ex="false" tool="1" flavor2="0">
       </item>
-      <item path="FEPClient.h" ex="false" tool="3" flavor2="0">
+      <item path="FEPSim.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="NetworkReader.cpp" ex="false" tool="1" flavor2="0">
@@ -101,7 +101,7 @@
       <item path="DataPacker.h" ex="false" tool="3" flavor2="0">
       </item>
-      <item path="FEPClient.cpp" ex="false" tool="1" flavor2="0">
+      <item path="FEPSim.cpp" ex="false" tool="1" flavor2="0">
       </item>
-      <item path="FEPClient.h" ex="false" tool="3" flavor2="0">
+      <item path="FEPSim.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="NetworkReader.cpp" ex="false" tool="1" flavor2="0">
Index: branches/FEPSimulator/nbproject/private/configurations.xml
===================================================================
--- branches/FEPSimulator/nbproject/private/configurations.xml	(revision 80)
+++ branches/FEPSimulator/nbproject/private/configurations.xml	(revision 82)
@@ -6,5 +6,5 @@
       <toolsSet>
         <developmentServer>localhost</developmentServer>
-        <platform>2</platform>
+        <platform>4</platform>
       </toolsSet>
       <dbx_gdbdebugger version="1">
@@ -28,6 +28,8 @@
           <runcommandpicklistitem>"${OUTPUT_PATH}" localhost networkFile.txt</runcommandpicklistitem>
           <runcommandpicklistitem>"${OUTPUT_PATH}" 192.168.251.27 networkFile.txt</runcommandpicklistitem>
+          <runcommandpicklistitem>"${OUTPUT_PATH}" 192.168.251.27</runcommandpicklistitem>
+          <runcommandpicklistitem>"${OUTPUT_PATH}" 192.168.251.27 8080</runcommandpicklistitem>
         </runcommandpicklist>
-        <runcommand>"${OUTPUT_PATH}" 192.168.251.27 networkFile.txt</runcommand>
+        <runcommand>"${OUTPUT_PATH}" 192.168.251.27 8080</runcommand>
         <rundir></rundir>
         <buildfirst>true</buildfirst>
Index: branches/FEPSimulator/nbproject/Package-Debug.bash
===================================================================
--- branches/FEPSimulator/nbproject/Package-Debug.bash	(revision 77)
+++ branches/FEPSimulator/nbproject/Package-Debug.bash	(revision 82)
@@ -7,14 +7,14 @@
 # Macros
 TOP=`pwd`
-CND_PLATFORM=GNU-Linux-x86
+CND_PLATFORM=GNU-MacOSX
 CND_CONF=Debug
 CND_DISTDIR=dist
 CND_BUILDDIR=build
-CND_DLIB_EXT=so
+CND_DLIB_EXT=dylib
 NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
 TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client
-OUTPUT_BASENAME=fep_rpc_client
-PACKAGE_TOP_DIR=feprpcclient/
+OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
+OUTPUT_BASENAME=fepsimulator
+PACKAGE_TOP_DIR=fepsimulator/
 
 # Functions
@@ -61,5 +61,5 @@
 # Copy files and create directories and links
 cd "${TOP}"
-makeDirectory "${NBTMPDIR}/feprpcclient/bin"
+makeDirectory "${NBTMPDIR}/fepsimulator/bin"
 copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755
 
@@ -67,7 +67,7 @@
 # Generate tar file
 cd "${TOP}"
-rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/feprpcclient.tar
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/fepsimulator.tar
 cd ${NBTMPDIR}
-tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/feprpcclient.tar *
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/fepsimulator.tar *
 checkReturnCode
 
Index: branches/FEPSimulator/nbproject/Makefile-impl.mk
===================================================================
--- branches/FEPSimulator/nbproject/Makefile-impl.mk	(revision 77)
+++ branches/FEPSimulator/nbproject/Makefile-impl.mk	(revision 82)
@@ -25,5 +25,5 @@
 
 # Project Name
-PROJECTNAME=fep_rpc_client
+PROJECTNAME=FEPSimulator
 
 # Active Configuration