diff --git a/C/xpcExample/xpcExample/src/main.cpp b/C/xpcExample/xpcExample/src/main.cpp
index 5792368..e9e645a 100644
--- a/C/xpcExample/xpcExample/src/main.cpp
+++ b/C/xpcExample/xpcExample/src/main.cpp
@@ -24,7 +24,7 @@ int main()
 	const char* IP = "127.0.0.1";      //IP Address of computer running X-Plane
 	XPCSocket sock = openUDP(IP);
 	float tVal[1];
-	int tSize;
+	int tSize = 1;
 	if (getDREF(sock, "sim/test/test_float", tVal, &tSize) < 0)
 	{
 		printf("Error establishing connecting. Unable to read data from X-Plane.");
diff --git a/MATLAB/+XPlaneConnect/readDATA.m b/MATLAB/+XPlaneConnect/readDATA.m
index 80f888e..1667c71 100644
--- a/MATLAB/+XPlaneConnect/readDATA.m
+++ b/MATLAB/+XPlaneConnect/readDATA.m
@@ -37,7 +37,7 @@ import XPlaneConnect.*
 %% Get client
 global clients;
 if ~exist('socket', 'var')
-    assert(istrue(length(clients) < 2), '[readDATA] ERROR: Multiple clients open. You must specify which client to use.');
+    assert(isequal((length(clients) < 2),1), '[readDATA] ERROR: Multiple clients open. You must specify which client to use.');
     if isempty(clients)
     	socket = openUDP(); 
     else
@@ -46,7 +46,7 @@ if ~exist('socket', 'var')
 end
 
 %% Get data
-result.raw = socket.readDATA();
+result.raw = socket.readData();
 
 %% Format data
 rows = (length(result.raw) - 5) / 9;
diff --git a/MATLAB/+XPlaneConnect/selectDATA.m b/MATLAB/+XPlaneConnect/selectDATA.m
index dc54fdc..47293f2 100644
--- a/MATLAB/+XPlaneConnect/selectDATA.m
+++ b/MATLAB/+XPlaneConnect/selectDATA.m
@@ -19,7 +19,7 @@ import XPlaneConnect.*
 %% Get client
 global clients;
 if ~exist('socket', 'var')
-    assert(istrue(length(clients) < 2), '[selectDATA] ERROR: Multiple clients open. You must specify which client to use.');
+    assert(isequal((length(clients) < 2),1), '[selectDATA] ERROR: Multiple clients open. You must specify which client to use.');
     if isempty(clients)
     	socket = openUDP(); 
     else
diff --git a/xpcPlugin/xpcPlugin.xcodeproj/project.pbxproj b/xpcPlugin/xpcPlugin.xcodeproj/project.pbxproj
index d752984..a7ed423 100755
--- a/xpcPlugin/xpcPlugin.xcodeproj/project.pbxproj
+++ b/xpcPlugin/xpcPlugin.xcodeproj/project.pbxproj
@@ -365,11 +365,9 @@
 					"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/xplaneConnect-asdjuezcjkhojuewbyxhyhabxfwc/Build/Products/Debug",
 				);
 				MACH_O_TYPE = mh_bundle;
-<<<<<<< HEAD
-				ONLY_ACTIVE_ARCH = YES;
-=======
+
 				ONLY_ACTIVE_ARCH = NO;
->>>>>>> master
+
 				PRODUCT_NAME = mac;
 				SDKROOT = macosx;
 				STRIP_INSTALLED_PRODUCT = YES;