diff --git a/BlueSocket.xcodeproj/project.pbxproj b/BlueSocket.xcodeproj/project.pbxproj
index f23ce0e..63444bf 100644
--- a/BlueSocket.xcodeproj/project.pbxproj
+++ b/BlueSocket.xcodeproj/project.pbxproj
@@ -201,7 +201,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = IBM;
 				TargetAttributes = {
 					8C0F4BF51C4E84CC008B2B0A = {
@@ -420,6 +420,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.ibm.oss.Socket;
 				PRODUCT_NAME = Socket;
 				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			name = Release;
 		};
@@ -444,6 +445,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ibm.oss.SocketTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			name = Release;
 		};
@@ -489,6 +491,7 @@
 				PRODUCT_NAME = BlueSocket;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			name = Release;
 		};
diff --git a/BlueSocket.xcodeproj/xcuserdata/babt.xcuserdatad/xcschemes/BlueSocket-iOS.xcscheme b/BlueSocket.xcodeproj/xcuserdata/babt.xcuserdatad/xcschemes/BlueSocket-iOS.xcscheme
index f78e09b..ac7dae1 100644
--- a/BlueSocket.xcodeproj/xcuserdata/babt.xcuserdatad/xcschemes/BlueSocket-iOS.xcscheme
+++ b/BlueSocket.xcodeproj/xcuserdata/babt.xcuserdatad/xcschemes/BlueSocket-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/BlueSocket.xcodeproj/xcuserdata/babt.xcuserdatad/xcschemes/BlueSocket.xcscheme b/BlueSocket.xcodeproj/xcuserdata/babt.xcuserdatad/xcschemes/BlueSocket.xcscheme
index ddf745c..da6b620 100644
--- a/BlueSocket.xcodeproj/xcuserdata/babt.xcuserdatad/xcschemes/BlueSocket.xcscheme
+++ b/BlueSocket.xcodeproj/xcuserdata/babt.xcuserdatad/xcschemes/BlueSocket.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/BlueSocket.xcodeproj/xcuserdata/babt.xcuserdatad/xcschemes/BlueSocketTests.xcscheme b/BlueSocket.xcodeproj/xcuserdata/babt.xcuserdatad/xcschemes/BlueSocketTests.xcscheme
index c66008f..8b7ca84 100644
--- a/BlueSocket.xcodeproj/xcuserdata/babt.xcuserdatad/xcschemes/BlueSocketTests.xcscheme
+++ b/BlueSocket.xcodeproj/xcuserdata/babt.xcuserdatad/xcschemes/BlueSocketTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/BlueSocket.xcworkspace/xcuserdata/babt.xcuserdatad/UserInterfaceState.xcuserstate b/BlueSocket.xcworkspace/xcuserdata/babt.xcuserdatad/UserInterfaceState.xcuserstate
index 482b500..b0e48a1 100644
Binary files a/BlueSocket.xcworkspace/xcuserdata/babt.xcuserdatad/UserInterfaceState.xcuserstate and b/BlueSocket.xcworkspace/xcuserdata/babt.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/README.md b/README.md
index 4e8ea2d..bb7bd0b 100644
--- a/README.md
+++ b/README.md
@@ -10,19 +10,17 @@ Socket framework for Swift using the Swift Package Manager. Works on OS X and Li
 ## Prerequisites
 
 ### Swift
-* Swift Open Source `swift-DEVELOPMENT-SNAPSHOT-2016-05-09-a` toolchain (**Minimum REQUIRED for latest release**)
-* Swift Open Source `swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a` toolchain
-* Swift Open Source `swift-DEVELOPMENT-SNAPSHOT-2016-06-06-a` toolchain (**Recommended**)
+* Swift Open Source `swift-DEVELOPMENT-SNAPSHOT-2016-06-20-a` toolchain (**Minimum REQUIRED for latest release**)
 
 ### OS X
 
 * OS X 10.11.0 (*El Capitan*) or higher
-* Xcode Version 7.3.1 (7D1012) or higher using the one of the above toolchains (*Recommended*)
+* Xcode Version 8.0 beta (8S128d) or higher using the above toolchain (*Recommended*)
 
 ### Linux
 
 * Ubuntu 15.10 (or 14.04 but only tested on 15.10)
-* One of the Swift Open Source toolchains listed above
+* The Swift Open Source toolchain listed above
 
 ### Add-ons
 
diff --git a/Sources/Socket.swift b/Sources/Socket.swift
index 181f0f9..8615c49 100644
--- a/Sources/Socket.swift
+++ b/Sources/Socket.swift
@@ -1066,9 +1066,11 @@ public class Socket: SocketReader, SocketWriter {
 		// Let the delegate do post accept handling and verification...
 		do {
 			
-			try self.delegate?.onAccept(socket: newSocket)
-			try self.delegate?.verifyConnection()
-			newSocket.signature?.isSecure = true
+			if self.delegate != nil {
+				try self.delegate?.onAccept(socket: newSocket)
+				try self.delegate?.verifyConnection()
+				newSocket.signature?.isSecure = true
+			}
 			
 		} catch let error {
 			
@@ -1188,9 +1190,11 @@ public class Socket: SocketReader, SocketWriter {
 		// Let the delegate do post accept handling and verification...
 		do {
 			
-			try self.delegate?.onAccept(socket: self)
-			try self.delegate?.verifyConnection()
-			self.signature?.isSecure = true
+			if self.delegate != nil {
+				try self.delegate?.onAccept(socket: self)
+				try self.delegate?.verifyConnection()
+				self.signature?.isSecure = true
+			}
 			
 		} catch let error {
 			
@@ -1413,9 +1417,11 @@ public class Socket: SocketReader, SocketWriter {
 		// Let the delegate do post connect handling and verification...
 		do {
 			
-			try self.delegate?.onConnect(socket: self)
-			try self.delegate?.verifyConnection()
-			self.signature?.isSecure = true
+			if self.delegate != nil {
+				try self.delegate?.onConnect(socket: self)
+				try self.delegate?.verifyConnection()
+				self.signature?.isSecure = true
+			}
 			
 		} catch let error {
 			
@@ -1501,9 +1507,11 @@ public class Socket: SocketReader, SocketWriter {
 		// Let the delegate do post connect handling and verification...
 		do {
 			
-			try self.delegate?.onConnect(socket: self)
-			try self.delegate?.verifyConnection()
-			self.signature?.isSecure = true
+			if self.delegate != nil {
+				try self.delegate?.onConnect(socket: self)
+				try self.delegate?.verifyConnection()
+				self.signature?.isSecure = true
+			}
 			
 		} catch let error {
 			
@@ -1795,15 +1803,22 @@ public class Socket: SocketReader, SocketWriter {
 		
 		let rc = try self.read(into: data)
 		
-		guard let str = NSString(data: data, encoding: NSUTF8StringEncoding)
-			where rc > 0 else {
-			
-			throw Error(code: Socket.SOCKET_ERR_INTERNAL, reason: "Unable to convert data to NSString.")
-		}
-		
 		#if os(Linux)
+			guard let str = NSString(data: data, encoding: NSUTF8StringEncoding)
+				where rc > 0 else {
+			
+				throw Error(code: Socket.SOCKET_ERR_INTERNAL, reason: "Unable to convert data to NSString.")
+			}
 			return str.bridge()
+		
 		#else
+			guard let str = NSString(data: data as Data, encoding: String.Encoding.utf8.rawValue)
+				where rc > 0 else {
+					
+					throw Error(code: Socket.SOCKET_ERR_INTERNAL, reason: "Unable to convert data to NSString.")
+			}
+
+			
 			return str as String
 		#endif
 		
@@ -1844,7 +1859,11 @@ public class Socket: SocketReader, SocketWriter {
 		if count > 0 {
 			
 			// - Yes, move to caller's buffer...
-			data.append(self.readStorage)
+			#if os(Linux)
+				data.append(self.readStorage)
+			#else
+				data.append(self.readStorage as Data)
+			#endif
 			
 			returnCount = self.readStorage.length