77 changed files with 1780 additions and 5625 deletions
--- a/.github/workflows/swift.yml
+++ b/.github/workflows/swift.yml
@ -1,19 +0,0 @@
-name: Swift
-
-on:
-  push:
-    branches: [ "master", "development" ]
-  pull_request:
-    branches: [ "master", "development" ]
-
-jobs:
-  build:
-
-    runs-on: macos-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Build
-        run: swift build -v
-      - name: Run tests
-        run: swift test -v
--- a/.gitignore
+++ b/.gitignore
@ -50,5 +50,3 @@ Socket.IO-Test-Server/node_modules/*
 .idea/
 docs/docsets/
 docs/undocumented.json
-
-.swiftpm
--- a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,18 @@
+language: objective-c
+xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder
+xcode_scheme: SocketIO-Mac
+osx_image: xcode12.2
+branches:
+  only:
+    - master
+    - development
+before_install:
+  # - brew update
+  # - brew outdated xctool || brew upgrade xctool
+  # - brew outdated carthage || brew upgrade carthage
+  - carthage update --platform macosx
+script:
+  - xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO build test -quiet
+#  - xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO build-for-testing -quiet
+#  - xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO run-tests --parallelize
+  - swift test
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,8 +1,3 @@
-# v16.1.0
-
- Remove support for iOS 11.
- Update to Starscream 4.0.6
-
 # v16.0.0

 - Removed Objective-C support. It's time for you to embrace Swift.
--- a/2
+++ b/2
@ -1 +1 @@
-github "daltoniam/Starscream" ~> 4.0.8
+github "daltoniam/Starscream" ~> 4.0
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@ -1 +1 @@
-github "daltoniam/Starscream" "4.0.8"
+github "daltoniam/Starscream" "4.0.4"
--- a/Package.resolved
+++ b/Package.resolved
@ -6,8 +6,8 @@
        "repositoryURL": "https://github.com/daltoniam/Starscream",
        "state": {
          "branch": null,
-          "revision": "c6bfd1af48efcc9a9ad203665db12375ba6b145a",
-          "version": "4.0.8"
+          "revision": "df8d82047f6654d8e4b655d1b1525c64e1059d21",
+          "version": "4.0.4"
        }
      }
    ]
--- a/Package.swift
+++ b/Package.swift
@ -1,4 +1,4 @@
-// swift-tools-version:5.4
+// swift-tools-version:5.3

 import PackageDescription

@ -8,7 +8,7 @@ let package = Package(
        .library(name: "SocketIO", targets: ["SocketIO"])
    ],
    dependencies: [
-        .package(url: "https://github.com/daltoniam/Starscream", .upToNextMajor(from: "4.0.8")),
+        .package(url: "https://github.com/daltoniam/Starscream", .upToNextMinor(from: "4.0.0")),
    ],
    targets: [
        .target(name: "SocketIO", dependencies: ["Starscream"]),
--- a/README.md
+++ b/README.md
@ -18,7 +18,7 @@ socket.on("currentAmount") {data, ack in
    guard let cur = data[0] as? Double else { return }
    
    socket.emitWithAck("canUpdate", cur).timingOut(after: 0) {data in
-        if data.first as? String ?? "passed" == SocketAckStatus.noAck {
+        if data.first as? String ?? "passed" == SocketAckValue.noAck {
            // Handle ack timeout 
        }

@ -31,23 +31,56 @@ socket.on("currentAmount") {data, ack in
 socket.connect()
 ```

+## Objective-C Example
+```objective-c
+@import SocketIO;
+
+NSURL* url = [[NSURL alloc] initWithString:@"http://localhost:8080"];
+SocketManager* manager = [[SocketManager alloc] initWithSocketURL:url config:@{@"log": @YES, @"compress": @YES}];
+SocketIOClient* socket = manager.defaultSocket;
+
+[socket on:@"connect" callback:^(NSArray* data, SocketAckEmitter* ack) {
+    NSLog(@"socket connected");
+}];
+
+[socket on:@"currentAmount" callback:^(NSArray* data, SocketAckEmitter* ack) {
+    double cur = [[data objectAtIndex:0] floatValue];
+
+    [[socket emitWithAck:@"canUpdate" with:@[@(cur)]] timingOutAfter:0 callback:^(NSArray* data) {
+        if ([[data[0] description] isEqualToString:@"NO ACK"]) {
+            // Handle ack timeout
+        }
+
+        [socket emit:@"update" with:@[@{@"amount": @(cur + 2.50)}]];
+    }];
+
+    [ack with:@[@"Got your currentAmount, ", @"dude"]];
+}];
+
+[socket connect];
+
+```
+
 ## Features
- Supports Socket.IO server 2.0+/3.0+/4.0+ (see the [compatibility table](https://nuclearace.github.io/Socket.IO-Client-Swift/Compatibility.html))
- Supports Binary
+- Supports socket.io 2.0+ (For socket.io 1.0 use v9.x)
+- Supports binary
 - Supports Polling and WebSockets
 - Supports TLS/SSL
+- Can be used from Objective-C

 ## FAQS
 Checkout the [FAQs](https://nuclearace.github.io/Socket.IO-Client-Swift/faq.html) for commonly asked questions.

-
 Checkout the [12to13](https://nuclearace.github.io/Socket.IO-Client-Swift/12to13.html) guide for migrating to v13+ from v12 below.

-Checkout the [15to16](https://nuclearace.github.io/Socket.IO-Client-Swift/15to16.html) guide for migrating to v16+ from v15.

 ## Installation
 Requires Swift 4/5 and Xcode 10.x

+If you need Swift 2.3 use the [swift2.3 tag](https://github.com/socketio/socket.io-client-swift/releases/tag/swift2.3) (Pre-Swift 4 support is no longer maintained)
+
+If you need Swift 3.x use v11.1.3.
+
 ### Swift Package Manager
 Add the project as a dependency to your Package.swift:
 ```swift
@ -61,7 +94,7 @@ let package = Package(
        .executable(name: "socket.io-test", targets: ["YourTargetName"])
    ],
    dependencies: [
-        .package(url: "https://github.com/socketio/socket.io-client-swift", .upToNextMinor(from: "16.1.1"))
+        .package(url: "https://github.com/socketio/socket.io-client-swift", .upToNextMinor(from: "15.0.0"))
    ],
    targets: [
        .target(name: "YourTargetName", dependencies: ["SocketIO"], path: "./Path/To/Your/Sources")
@ -74,7 +107,7 @@ Then import `import SocketIO`.
 ### Carthage
 Add this line to your `Cartfile`:
 ```
-github "socketio/socket.io-client-swift" ~> 16.1.1
+github "socketio/socket.io-client-swift" ~> 15.2.0
 ```

 Run `carthage update --platform ios,macosx`.
@ -88,7 +121,7 @@ Create `Podfile` and add `pod 'Socket.IO-Client-Swift'`:
 use_frameworks!

 target 'YourApp' do
-    pod 'Socket.IO-Client-Swift', '~> 16.1.1'
+    pod 'Socket.IO-Client-Swift', '~> 15.2.0'
 end
 ```

--- a/Socket.IO-Client-Swift.podspec
+++ b/Socket.IO-Client-Swift.podspec
@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
  s.name         = "Socket.IO-Client-Swift"
  s.module_name  = "SocketIO"
-  s.version      = "16.1.1"
+  s.version      = "16.0.0-beta0"
  s.summary      = "Socket.IO-client for iOS and OS X"
  s.description  = <<-DESC
                   Socket.IO-client for iOS and OS X.
@ -11,21 +11,21 @@ Pod::Spec.new do |s|
  s.homepage     = "https://github.com/socketio/socket.io-client-swift"
  s.license      = { :type => 'MIT' }
  s.author       = { "Erik" => "nuclear.ace@gmail.com" }
-  s.ios.deployment_target = '12.0'
+  s.ios.deployment_target = '10.0'
  s.osx.deployment_target = '10.13'
-  s.tvos.deployment_target = '12.0'
+  s.tvos.deployment_target = '10.0'
  s.watchos.deployment_target = '5.0'
  s.requires_arc = true
  s.source = {
    :git => "https://github.com/socketio/socket.io-client-swift.git",
-    :tag => 'v16.1.1',
+    :tag => 'v16.0.0-beta0',
    :submodules => true
  }

  s.swift_version = "5"
  s.pod_target_xcconfig = {
-      'SWIFT_VERSION' => '5.4'
+      'SWIFT_VERSION' => '5.0'
  }
  s.source_files  = "Source/SocketIO/**/*.swift", "Source/SocketIO/*.swift"
-  s.dependency "Starscream", "~> 4.0.8"
+  s.dependency "Starscream", "~> 4.0"
 end
--- a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj
+++ b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj
@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 46;
 	objects = {

 /* Begin PBXBuildFile section */
@ -19,9 +19,9 @@
 		1C686BE71F869AFD007D8627 /* SocketParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C686BD71F869AF1007D8627 /* SocketParserTest.swift */; };
 		1C686BE81F869AFD007D8627 /* SocketNamespacePacketTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C686BD81F869AF1007D8627 /* SocketNamespacePacketTest.swift */; };
 		572EF2431B51F18A00EEBB58 /* SocketIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 572EF2381B51F18A00EEBB58 /* SocketIO.framework */; };
-		579C7D4C2731B487009F8A2F /* Starscream.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 579C7D4B2731B487009F8A2F /* Starscream.xcframework */; };
 		6CA08A981D615C0B0061FD2A /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CA08A971D615C0B0061FD2A /* Security.framework */; };
 		74BF53581F894326004972D8 /* SocketIO.h in Headers */ = {isa = PBXBuildFile; fileRef = 572EF23C1B51F18A00EEBB58 /* SocketIO.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		74D0F5961F8053950037C4DC /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9432E00B1F77F883006AF628 /* Starscream.framework */; };
 		74DA21741F09440F009C19EE /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 74DA21731F09440F009C19EE /* libz.tbd */; };
 		74DA217C1F09457B009C19EE /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 74DA21731F09440F009C19EE /* libz.tbd */; };
 		DD52B048C71D724ABBD18C71 /* SocketTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD52BDC9E66AADA2CC5E8246 /* SocketTypes.swift */; };
@ -75,15 +75,18 @@
 		572EF23B1B51F18A00EEBB58 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		572EF23C1B51F18A00EEBB58 /* SocketIO.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SocketIO.h; sourceTree = "<group>"; };
 		572EF2421B51F18A00EEBB58 /* SocketIO-Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SocketIO-Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
-		579C7D4B2731B487009F8A2F /* Starscream.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Starscream.xcframework; path = Carthage/Build/Starscream.xcframework; sourceTree = "<group>"; };
 		6CA08A951D615C040061FD2A /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
 		6CA08A971D615C0B0061FD2A /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		6CA08A991D615C140061FD2A /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.2.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
+		749FA19F1F8112E7002FBB30 /* Starscream.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = Starscream.framework.dSYM; path = Carthage/Build/Mac/Starscream.framework.dSYM; sourceTree = "<group>"; };
 		749FA1A11F811408002FBB30 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		74D0F58D1F804FED0037C4DC /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.0.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; };
 		74DA21731F09440F009C19EE /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		74DA217D1F0945E9009C19EE /* libcommonCrypto.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libcommonCrypto.tbd; path = usr/lib/system/libcommonCrypto.tbd; sourceTree = SDKROOT; };
 		9432E0061F77F7CA006AF628 /* SSLSecurity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SSLSecurity.swift; sourceTree = "<group>"; };
+		9432E0091F77F87D006AF628 /* Starscream.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Starscream.framework; path = Carthage/Build/iOS/Starscream.framework; sourceTree = "<group>"; };
+		9432E00B1F77F883006AF628 /* Starscream.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Starscream.framework; path = Carthage/Build/Mac/Starscream.framework; sourceTree = "<group>"; };
+		9432E00D1F77F889006AF628 /* Starscream.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Starscream.framework; path = Carthage/Build/tvOS/Starscream.framework; sourceTree = "<group>"; };
 		DD52B078DB0A3C3D1BB507CD /* SocketIOClientOption.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketIOClientOption.swift; sourceTree = "<group>"; };
 		DD52B09F7984E730513AB7E5 /* SocketAckManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketAckManager.swift; sourceTree = "<group>"; };
 		DD52B1D9BC4AE46D38D827DE /* SocketIOStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketIOStatus.swift; sourceTree = "<group>"; };
@ -117,8 +120,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				74DA21741F09440F009C19EE /* libz.tbd in Frameworks */,
-				579C7D4C2731B487009F8A2F /* Starscream.xcframework in Frameworks */,
 				6CA08A981D615C0B0061FD2A /* Security.framework in Frameworks */,
+				74D0F5961F8053950037C4DC /* Starscream.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -228,8 +231,11 @@
 			isa = PBXGroup;
 			children = (
 				749FA1A11F811408002FBB30 /* Foundation.framework */,
-				579C7D4B2731B487009F8A2F /* Starscream.xcframework */,
+				749FA19F1F8112E7002FBB30 /* Starscream.framework.dSYM */,
 				74D0F58D1F804FED0037C4DC /* libz.tbd */,
+				9432E0091F77F87D006AF628 /* Starscream.framework */,
+				9432E00B1F77F883006AF628 /* Starscream.framework */,
+				9432E00D1F77F889006AF628 /* Starscream.framework */,
 				74DA217D1F0945E9009C19EE /* libcommonCrypto.tbd */,
 				74DA21731F09440F009C19EE /* libz.tbd */,
 				6CA08A9E1D615C340061FD2A /* tvOS */,
@ -344,9 +350,9 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 572EF24B1B51F18A00EEBB58 /* Build configuration list for PBXNativeTarget "SocketIO" */;
 			buildPhases = (
-				572EF2351B51F18A00EEBB58 /* Headers */,
 				572EF2331B51F18A00EEBB58 /* Sources */,
 				572EF2341B51F18A00EEBB58 /* Frameworks */,
+				572EF2351B51F18A00EEBB58 /* Headers */,
 				572EF2361B51F18A00EEBB58 /* Resources */,
 			);
 			buildRules = (
@ -511,6 +517,7 @@
 		572EF2121B51F12F00EEBB58 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				BITCODE_GENERATION_MODE = bitcode;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@ -530,11 +537,37 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "Mac Developer";
+				ENABLE_BITCODE = YES;
+				"ENABLE_BITCODE[sdk=macosx*]" = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				FRAMEWORK_SEARCH_PATHS = (
+				"FRAMEWORK_SEARCH_PATHS[sdk=appletvos*]" = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/tvOS",
+				);
+				"FRAMEWORK_SEARCH_PATHS[sdk=appletvsimulator*]" = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/tvOS",
+				);
+				"FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*]" = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
+				"FRAMEWORK_SEARCH_PATHS[sdk=iphonesimulator*]" = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
+				"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/Mac",
+				);
+				"FRAMEWORK_SEARCH_PATHS[sdk=watchos*]" = (
+					"$(PROJECT_DIR)/Carthage/Build/watchOS",
+					"$(inherited)",
+				);
+				"FRAMEWORK_SEARCH_PATHS[sdk=watchsimulator*]" = (
+					"$(PROJECT_DIR)/Carthage/Build/watchOS",
 					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Build/",
 				);
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@ -544,22 +577,23 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = SocketIO;
-				SUPPORTED_PLATFORMS = "macosx appletvsimulator appletvos iphonesimulator iphoneos watchos watchsimulator xrsimulator xros";
+				SUPPORTED_PLATFORMS = "macosx appletvsimulator appletvos iphonesimulator iphoneos watchos watchsimulator";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				TVOS_DEPLOYMENT_TARGET = 10.0;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALID_ARCHS = "i386 x86_64 armv7 armv7s arm64 armv7k";
-				WATCHOS_DEPLOYMENT_TARGET = 7.0;
+				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
 			name = Debug;
 		};
 		572EF2131B51F12F00EEBB58 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				BITCODE_GENERATION_MODE = bitcode;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
@ -579,10 +613,36 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "Mac Developer";
+				ENABLE_BITCODE = YES;
+				"ENABLE_BITCODE[sdk=macosx*]" = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				FRAMEWORK_SEARCH_PATHS = (
+				"FRAMEWORK_SEARCH_PATHS[sdk=appletvos*]" = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/tvOS",
+				);
+				"FRAMEWORK_SEARCH_PATHS[sdk=appletvsimulator*]" = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/tvOS",
+				);
+				"FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*]" = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
+				"FRAMEWORK_SEARCH_PATHS[sdk=iphonesimulator*]" = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
+				"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/Mac",
+				);
+				"FRAMEWORK_SEARCH_PATHS[sdk=watchos*]" = (
+					"$(PROJECT_DIR)/Carthage/Build/watchOS",
+					"$(inherited)",
+				);
+				"FRAMEWORK_SEARCH_PATHS[sdk=watchsimulator*]" = (
+					"$(PROJECT_DIR)/Carthage/Build/watchOS",
 					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Build/",
 				);
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@ -591,25 +651,22 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_NAME = SocketIO;
-				SUPPORTED_PLATFORMS = "macosx appletvsimulator appletvos iphonesimulator iphoneos watchos watchsimulator xrsimulator xros";
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SUPPORTED_PLATFORMS = "macosx appletvsimulator appletvos iphonesimulator iphoneos watchos watchsimulator";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 5.0;
-				TVOS_DEPLOYMENT_TARGET = 10.0;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALID_ARCHS = "i386 x86_64 armv7 armv7s arm64 armv7k";
-				WATCHOS_DEPLOYMENT_TARGET = 7.0;
+				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
 			name = Release;
 		};
 		572EF24C1B51F18A00EEBB58 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@ -632,6 +689,8 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_BITCODE = YES;
+				"ENABLE_BITCODE[sdk=macosx*]" = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@ -652,17 +711,8 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = SocketIO/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
-					"$(inherited)",
-					"@executable_path/../Frameworks",
-					"@loader_path/../Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = YES;
@ -671,15 +721,12 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "$(inherited)";
-				SUPPORTS_MACCATALYST = YES;
-				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
-				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_INCLUDE_PATHS = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2,3,4,7";
-				TVOS_DEPLOYMENT_TARGET = 12.0;
+				TARGETED_DEVICE_FAMILY = "1,2,3,4";
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VALID_ARCHS = "$(inherited)";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@ -689,9 +736,7 @@
 		572EF24D1B51F18A00EEBB58 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@ -714,6 +759,8 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_BITCODE = YES;
+				"ENABLE_BITCODE[sdk=macosx*]" = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@ -729,17 +776,8 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = SocketIO/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
-					"$(inherited)",
-					"@executable_path/../Frameworks",
-					"@loader_path/../Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
@ -747,14 +785,11 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "$(inherited)";
-				SUPPORTS_MACCATALYST = YES;
-				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
-				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_INCLUDE_PATHS = "";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2,3,4,7";
-				TVOS_DEPLOYMENT_TARGET = 12.0;
+				TARGETED_DEVICE_FAMILY = "1,2,3,4";
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VALID_ARCHS = "$(inherited)";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@ -782,6 +817,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
@ -824,17 +860,10 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = SocketIO/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
-					"@executable_path/../Frameworks",
-					"@loader_path/../Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks @loader_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.socket.$(PRODUCT_NAME:rfc1034identifier)";
@ -844,7 +873,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
-				TVOS_DEPLOYMENT_TARGET = 12.0;
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VALID_ARCHS = "$(inherited)";
 			};
 			name = Debug;
@ -870,6 +899,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@ -906,17 +936,10 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = SocketIO/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
-					"@executable_path/../Frameworks",
-					"@loader_path/../Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks @loader_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.socket.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@ -924,7 +947,7 @@
 				SUPPORTED_PLATFORMS = "$(inherited)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
-				TVOS_DEPLOYMENT_TARGET = 12.0;
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VALID_ARCHS = "$(inherited)";
 			};
 			name = Release;
--- a/Source/SocketIO/Ack/SocketAckEmitter.swift
+++ b/Source/SocketIO/Ack/SocketAckEmitter.swift
@ -28,7 +28,7 @@ import Foundation
 /// A class that represents a waiting ack call.
 ///
 /// **NOTE**: You should not store this beyond the life of the event handler.
-public final class SocketAckEmitter: NSObject {
+public final class SocketAckEmitter : NSObject {
    private unowned let socket: SocketIOClient
    private let ackNum: Int

@ -101,7 +101,7 @@ public final class SocketAckEmitter: NSObject {
 ///     ...
 /// }
 /// ```
-public final class OnAckCallback: NSObject {
+public final class OnAckCallback : NSObject {
    private let ackNumber: Int
    private let binary: Bool
    private let items: [Any]
--- a/Source/SocketIO/Client/SocketIOClient.swift
+++ b/Source/SocketIO/Client/SocketIOClient.swift
@ -79,7 +79,6 @@ open class SocketIOClient: NSObject, SocketIOClientSpec {
    public private(set) var sid: String?

    let ackHandlers = SocketAckManager()
-    var connectPayload: [String: Any]?

    private(set) var currentAck = -1

@ -108,21 +107,18 @@ open class SocketIOClient: NSObject, SocketIOClientSpec {
    /// Connect to the server. The same as calling `connect(timeoutAfter:withHandler:)` with a timeout of 0.
    ///
    /// Only call after adding your event listeners, unless you know what you're doing.
-    ///
-    /// - parameter withPayload: An optional payload sent on connect
-    open func connect(withPayload payload: [String: Any]? = nil) {
-        connect(withPayload: payload, timeoutAfter: 0, withHandler: nil)
+    open func connect() {
+        connect(timeoutAfter: 0, withHandler: nil)
    }

    /// Connect to the server. If we aren't connected after `timeoutAfter` seconds, then `withHandler` is called.
    ///
    /// Only call after adding your event listeners, unless you know what you're doing.
    ///
-    /// - parameter withPayload: An optional payload sent on connect
    /// - parameter timeoutAfter: The number of seconds after which if we are not connected we assume the connection
    ///                           has failed. Pass 0 to never timeout.
    /// - parameter handler: The handler to call when the client fails to connect.
-    open func connect(withPayload payload: [String: Any]? = nil, timeoutAfter: Double, withHandler handler: (() -> ())?) {
+    open func connect(timeoutAfter: Double, withHandler handler: (() -> ())?) {
        assert(timeoutAfter >= 0, "Invalid timeout: \(timeoutAfter)")

        guard let manager = self.manager, status != .connected else {
@ -132,26 +128,13 @@ open class SocketIOClient: NSObject, SocketIOClientSpec {

        status = .connecting

-        joinNamespace(withPayload: payload)
-
-        switch manager.version {
-        case .three:
-            break
-        case .two where manager.status == .connected && nsp == "/":
-            // We might not get a connect event for the default nsp, fire immediately
-            didConnect(toNamespace: nsp, payload: nil)
-
-            return
-        case _:
-            break
-        }
+        joinNamespace()

        guard timeoutAfter != 0 else { return }

        manager.handleQueue.asyncAfter(deadline: DispatchTime.now() + timeoutAfter) {[weak self] in
            guard let this = self, this.status == .connecting || this.status == .notConnected else { return }
-            DefaultSocketLogger.Logger.log("Timeout: Socket not connected, so setting to disconnected", type: this.logType)
-            
+
            this.status = .disconnected
            this.leaveNamespace()

@ -213,19 +196,6 @@ open class SocketIOClient: NSObject, SocketIOClientSpec {
    /// - parameter items: The items to send with this event. May be left out.
    /// - parameter completion: Callback called on transport write completion.
    open func emit(_ event: String, _ items: SocketData..., completion: (() -> ())? = nil)  {
-        emit(event, with: items, completion: completion)
-    }
-    
-    /// Send an event to the server, with optional data items and optional write completion handler.
-    ///
-    /// If an error occurs trying to transform `items` into their socket representation, a `SocketClientEvent.error`
-    /// will be emitted. The structure of the error data is `[eventName, items, theError]`
-    ///
-    /// - parameter event: The event to send.
-    /// - parameter items: The items to send with this event. May be left out.
-    /// - parameter completion: Callback called on transport write completion.
-    open func emit(_ event: String, with items: [SocketData], completion: (() -> ())?) {
-        
        do {
            emit([event] + (try items.map({ try $0.socketRepresentation() })), completion: completion)
        } catch {
@ -256,30 +226,6 @@ open class SocketIOClient: NSObject, SocketIOClientSpec {
    /// - parameter items: The items to send with this event. May be left out.
    /// - returns: An `OnAckCallback`. You must call the `timingOut(after:)` method before the event will be sent.
    open func emitWithAck(_ event: String, _ items: SocketData...) -> OnAckCallback {
-        emitWithAck(event, with: items)
-    }
-    
-    /// Sends a message to the server, requesting an ack.
-    ///
-    /// **NOTE**: It is up to the server send an ack back, just calling this method does not mean the server will ack.
-    /// Check that your server's api will ack the event being sent.
-    ///
-    /// If an error occurs trying to transform `items` into their socket representation, a `SocketClientEvent.error`
-    /// will be emitted. The structure of the error data is `[eventName, items, theError]`
-    ///
-    /// Example:
-    ///
-    /// ```swift
-    /// socket.emitWithAck("myEvent", 1).timingOut(after: 1) {data in
-    ///     ...
-    /// }
-    /// ```
-    ///
-    /// - parameter event: The event to send.
-    /// - parameter items: The items to send with this event. May be left out.
-    /// - returns: An `OnAckCallback`. You must call the `timingOut(after:)` method before the event will be sent.
-    open func emitWithAck(_ event: String, with items: [SocketData]) -> OnAckCallback {
-        
        do {
            return createOnAck([event] + (try items.map({ try $0.socketRepresentation() })))
        } catch {
@ -394,15 +340,11 @@ open class SocketIOClient: NSObject, SocketIOClientSpec {
        manager?.disconnectSocket(self)
    }

-    /// Joins `nsp`. You shouldn't need to call this directly, instead call `connect`.
-    ///
-    /// - parameter withPayload: An optional payload sent on connect
-    open func joinNamespace(withPayload payload: [String: Any]? = nil) {
+    /// Joins `nsp`.
+    open func joinNamespace() {
        DefaultSocketLogger.Logger.log("Joining namespace \(nsp)", type: logType)

-        connectPayload = payload
-
-        manager?.connectSocket(self, withPayload: connectPayload)
+        manager?.connectSocket(self)
    }

    /// Removes handler(s) for a client event.
--- a/Source/SocketIO/Client/SocketIOClientOption.swift
+++ b/Source/SocketIO/Client/SocketIOClientOption.swift
@ -25,15 +25,6 @@
 import Foundation
 import Starscream

-/// The socket.io version being used.
-public enum SocketIOVersion: Int {
-    /// socket.io 2, engine.io 3
-    case two = 2
-
-    /// socket.io 3, engine.io 4
-    case three = 3
-}
-
 protocol ClientOption : CustomStringConvertible, Equatable {
    func getSocketIOOptionValue() -> Any
 }
@ -108,12 +99,6 @@ public enum SocketIOClientOption : ClientOption {
    /// Sets an NSURLSessionDelegate for the underlying engine. Useful if you need to handle self-signed certs.
    case sessionDelegate(URLSessionDelegate)

-    /// If passed `false`, the WebSocket stream will be configured with the useCustomEngine `false`.
-    case useCustomEngine(Bool)
-
-    /// The version of socket.io being used. This should match the server version. Default is 3.
-    case version(SocketIOVersion)
-
    // MARK: Properties

    /// The description of this option.
@ -163,10 +148,6 @@ public enum SocketIOClientOption : ClientOption {
            description = "sessionDelegate"
        case .enableSOCKSProxy:
            description = "enableSOCKSProxy"
-        case .useCustomEngine:
-            description = "customEngine"
-        case .version:
-            description = "version"
        }

        return description
@ -218,10 +199,6 @@ public enum SocketIOClientOption : ClientOption {
            value = delegate
        case let .enableSOCKSProxy(enable):
            value = enable
-        case let .useCustomEngine(enable):
-            value = enable
-        case let.version(versionNum):
-            value = versionNum
        }

        return value
--- a/Source/SocketIO/Client/SocketIOClientSpec.swift
+++ b/Source/SocketIO/Client/SocketIOClientSpec.swift
@ -65,19 +65,16 @@ public protocol SocketIOClientSpec : AnyObject {
    /// Connect to the server. The same as calling `connect(timeoutAfter:withHandler:)` with a timeout of 0.
    ///
    /// Only call after adding your event listeners, unless you know what you're doing.
-    ///
-    /// - parameter payload: An optional payload sent on connect
-    func connect(withPayload payload: [String: Any]?)
+    func connect()

    /// Connect to the server. If we aren't connected after `timeoutAfter` seconds, then `withHandler` is called.
    ///
    /// Only call after adding your event listeners, unless you know what you're doing.
    ///
-    /// - parameter withPayload: An optional payload sent on connect
    /// - parameter timeoutAfter: The number of seconds after which if we are not connected we assume the connection
    ///                           has failed. Pass 0 to never timeout.
    /// - parameter handler: The handler to call when the client fails to connect.
-    func connect(withPayload payload: [String: Any]?, timeoutAfter: Double, withHandler handler: (() -> ())?)
+    func connect(timeoutAfter: Double, withHandler handler: (() -> ())?)

    /// Called when the client connects to a namespace. If the client was created with a namespace upfront,
    /// then this is only called when the client connects to that namespace.
@ -107,16 +104,6 @@ public protocol SocketIOClientSpec : AnyObject {
    /// - parameter items: The items to send with this event. May be left out.
    /// - parameter completion: Callback called on transport write completion.
    func emit(_ event: String, _ items: SocketData..., completion: (() -> ())?)
-    
-    /// Send an event to the server, with optional data items and optional write completion handler.
-    ///
-    /// If an error occurs trying to transform `items` into their socket representation, a `SocketClientEvent.error`
-    /// will be emitted. The structure of the error data is `[eventName, items, theError]`
-    ///
-    /// - parameter event: The event to send.
-    /// - parameter items: The items to send with this event. May be left out.
-    /// - parameter completion: Callback called on transport write completion.
-    func emit(_ event: String, with items: [SocketData], completion: (() -> ())?)

    /// Call when you wish to tell the server that you've received the event for `ack`.
    ///
@ -144,27 +131,6 @@ public protocol SocketIOClientSpec : AnyObject {
    /// - parameter items: The items to send with this event. May be left out.
    /// - returns: An `OnAckCallback`. You must call the `timingOut(after:)` method before the event will be sent.
    func emitWithAck(_ event: String, _ items: SocketData...) -> OnAckCallback
-    
-    /// Sends a message to the server, requesting an ack.
-    ///
-    /// **NOTE**: It is up to the server send an ack back, just calling this method does not mean the server will ack.
-    /// Check that your server's api will ack the event being sent.
-    ///
-    /// If an error occurs trying to transform `items` into their socket representation, a `SocketClientEvent.error`
-    /// will be emitted. The structure of the error data is `[eventName, items, theError]`
-    ///
-    /// Example:
-    ///
-    /// ```swift
-    /// socket.emitWithAck("myEvent", 1).timingOut(after: 1) {data in
-    ///     ...
-    /// }
-    /// ```
-    ///
-    /// - parameter event: The event to send.
-    /// - parameter items: The items to send with this event. May be left out.
-    /// - returns: An `OnAckCallback`. You must call the `timingOut(after:)` method before the event will be sent.
-    func emitWithAck(_ event: String, with items: [SocketData]) -> OnAckCallback

    /// Called when socket.io has acked one of our emits. Causes the corresponding ack callback to be called.
    ///
@ -195,10 +161,8 @@ public protocol SocketIOClientSpec : AnyObject {
    /// Call when you wish to leave a namespace and disconnect this socket.
    func leaveNamespace()

-    /// Joins `nsp`. You shouldn't need to call this directly, instead call `connect`.
-    ///
-    /// - Parameter withPayload: The payload to connect when joining this namespace
-    func joinNamespace(withPayload payload: [String: Any]?)
+    /// Joins `nsp`.
+    func joinNamespace()

    /// Removes handler(s) for a client event.
    ///
--- a/Source/SocketIO/Engine/SocketEngine.swift
+++ b/Source/SocketIO/Engine/SocketEngine.swift
@ -28,10 +28,8 @@ import Starscream

 /// The class that handles the engine.io protocol and transports.
 /// See `SocketEnginePollable` and `SocketEngineWebsocket` for transport specific methods.
-open class SocketEngine: NSObject, WebSocketDelegate, URLSessionDelegate,
-                         SocketEnginePollable, SocketEngineWebsocket, ConfigSettable {
-  
-  
+open class SocketEngine:
+        NSObject, WebSocketDelegate, URLSessionDelegate, SocketEnginePollable, SocketEngineWebsocket, ConfigSettable {
    // MARK: Properties

    private static let logType = "SocketEngine"
@ -113,12 +111,6 @@ open class SocketEngine: NSObject, WebSocketDelegate, URLSessionDelegate,
    /// The url for WebSockets.
    public private(set) var urlWebSocket = URL(string: "http://localhost/")!

-    /// When `false`, the WebSocket `stream` will be configured with the useCustomEngine `false`.
-    public private(set) var useCustomEngine = true
-
-    /// The version of engine.io being used. Default is three.
-    public private(set) var version: SocketIOVersion = .three
-
    /// If `true`, then the engine is currently in WebSockets mode.
    @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets")
    public private(set) var websocket = false
@ -141,14 +133,8 @@ open class SocketEngine: NSObject, WebSocketDelegate, URLSessionDelegate,

    private var lastCommunication: Date?
    private var pingInterval: Int?
-    private var pingTimeout = 0 {
-        didSet {
-            pongsMissedMax = Int(pingTimeout / (pingInterval ?? 25000))
-        }
-    }
+    private var pingTimeout = 0

-    private var pongsMissed = 0
-    private var pongsMissedMax = 0
    private var probeWait = ProbeWaitQueue()
    private var secure = false
    private var certPinner: CertificatePinning?
@ -210,9 +196,8 @@ open class SocketEngine: NSObject, WebSocketDelegate, URLSessionDelegate,
    }

    private func handleBase64(message: String) {
-        let offset = version.rawValue >= 3 ? 1 : 2
        // binary in base64 string
-        let noPrefix = String(message[message.index(message.startIndex, offsetBy: offset)..<message.endIndex])
+        let noPrefix = String(message[message.index(message.startIndex, offsetBy: 1)..<message.endIndex])

        if let data = Data(base64Encoded: noPrefix, options: .ignoreUnknownCharacters) {
            client?.parseEngineBinaryData(data)
@ -293,14 +278,6 @@ open class SocketEngine: NSObject, WebSocketDelegate, URLSessionDelegate,
        urlWebSocket.percentEncodedQuery = "transport=websocket" + queryString
        urlPolling.percentEncodedQuery = "transport=polling&b64=1" + queryString

-        if !urlWebSocket.percentEncodedQuery!.contains("EIO") {
-            urlWebSocket.percentEncodedQuery = urlWebSocket.percentEncodedQuery! + engineIOParam
-        }
-
-        if !urlPolling.percentEncodedQuery!.contains("EIO") {
-            urlPolling.percentEncodedQuery = urlPolling.percentEncodedQuery! + engineIOParam
-        }
-
        return (urlPolling.url!, urlWebSocket.url!)
    }

@ -312,7 +289,7 @@ open class SocketEngine: NSObject, WebSocketDelegate, URLSessionDelegate,
            includingCookies: session?.configuration.httpCookieStorage?.cookies(for: urlPollingWithSid)
        )

-        ws = WebSocket(request: req, certPinner: certPinner, compressionHandler: compress ? WSCompression() : nil, useCustomEngine: useCustomEngine)
+        ws = WebSocket(request: req, certPinner: certPinner, compressionHandler: compress ? WSCompression() : nil)
        ws?.callbackQueue = engineQueue
        ws?.delegate = self

@ -436,7 +413,6 @@ open class SocketEngine: NSObject, WebSocketDelegate, URLSessionDelegate,

        self.sid = sid
        connected = true
-        pongsMissed = 0

        if let upgrades = json["upgrades"] as? [String] {
            upgradeWs = upgrades.contains("websocket")
@ -453,22 +429,15 @@ open class SocketEngine: NSObject, WebSocketDelegate, URLSessionDelegate,
            createWebSocketAndConnect()
        }

-        if version.rawValue >= 3 {
-            checkPings()
-        } else {
-            sendPing()
-        }
-
        if !forceWebsockets {
            doPoll()
        }

+        checkPings()
        client?.engineDidOpen(reason: "Connect")
    }

    private func handlePong(with message: String) {
-        pongsMissed = 0
-
        // We should upgrade
        if message == "3probe" {
            DefaultSocketLogger.Logger.log("Received probe response, should upgrade to WebSockets",
@ -476,14 +445,10 @@ open class SocketEngine: NSObject, WebSocketDelegate, URLSessionDelegate,

            upgradeTransport()
        }
-
-        client?.engineDidReceivePong()
    }

    private func handlePing(with message: String) {
-        if version.rawValue >= 3 {
-            write("", withType: .pong, withData: [])
-        }
+        write("", withType: .pong, withData: [])

        client?.engineDidReceivePing()
    }
@ -513,7 +478,7 @@ open class SocketEngine: NSObject, WebSocketDelegate, URLSessionDelegate,

        lastCommunication = Date()

-        client?.parseEngineBinaryData(version.rawValue >= 3 ? data : data.subdata(in: 1..<data.endIndex))
+        client?.parseEngineBinaryData(data)
    }

    /// Parses a raw engine.io packet.
@ -524,11 +489,13 @@ open class SocketEngine: NSObject, WebSocketDelegate, URLSessionDelegate,

        DefaultSocketLogger.Logger.log("Got message: \(message)", type: SocketEngine.logType)

-        if message.hasPrefix(version.rawValue >= 3 ? "b" : "b4") {
+        let reader = SocketStringReader(message: message)
+
+        if message.hasPrefix("b") {
            return handleBase64(message: message)
        }

-        guard let type = SocketEnginePacketType(rawValue: message.first?.wholeNumberValue ?? -1) else {
+        guard let type = SocketEnginePacketType(rawValue: Int(reader.currentCharacter) ?? -1) else {
            checkAndHandleEngineError(message)

            return
@ -569,32 +536,6 @@ open class SocketEngine: NSObject, WebSocketDelegate, URLSessionDelegate,
        waitingForPost = false
    }

-    private func sendPing() {
-        guard connected, let pingInterval = pingInterval else {
-            return
-        }
-
-        // Server is not responding
-        if pongsMissed > pongsMissedMax {
-            closeOutEngine(reason: "Ping timeout")
-            return
-        }
-
-        pongsMissed += 1
-        write("", withType: .ping, withData: [], completion: nil)
-
-        engineQueue.asyncAfter(deadline: .now() + .milliseconds(pingInterval)) {[weak self, id = self.sid] in
-            // Make sure not to ping old connections
-            guard let this = self, this.sid == id else {
-                return
-            }
-
-            this.sendPing()
-        }
-
-        client?.engineDidSendPing()
-    }
-
    /// Called when the engine should set/update its configs from a given configuration.
    ///
    /// parameter config: The `SocketIOClientConfiguration` that should be used to set/update configs.
@ -629,10 +570,6 @@ open class SocketEngine: NSObject, WebSocketDelegate, URLSessionDelegate,
                self.compress = true
            case .enableSOCKSProxy:
                self.enableSOCKSProxy = true
-            case let .useCustomEngine(enable):
-                self.useCustomEngine = enable
-            case let .version(num):
-                version = num
            default:
                continue
            }
@ -744,27 +681,16 @@ enum EngineError: Error {
 }

 extension SocketEngine {
-    /// Delegate method for WebSocketDelegate.
-    ///
-    /// - Parameters:
-    ///   - event: WS Event
-    ///   - _:
-    public func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocketClient) {
+    public func didReceive(event: WebSocketEvent, client _: WebSocket) {
        switch event {
        case let .connected(headers):
            wsConnected = true
-            self.client?.engineDidWebsocketUpgrade(headers: headers)
+            client?.engineDidWebsocketUpgrade(headers: headers)
            websocketDidConnect()
        case .cancelled:
            wsConnected = false
            websocketDidDisconnect(error: EngineError.canceled)
-        case .disconnected(_, _):
-            wsConnected = false
-            websocketDidDisconnect(error: nil)
-        case .viabilityChanged(false):
-            wsConnected = false
-            websocketDidDisconnect(error: nil)
-        case .peerClosed:
+        case let .disconnected(reason, code):
            wsConnected = false
            websocketDidDisconnect(error: nil)
        case let .text(msg):
--- a/Source/SocketIO/Engine/SocketEngineClient.swift
+++ b/Source/SocketIO/Engine/SocketEngineClient.swift
@ -44,16 +44,10 @@ import Foundation
    /// - parameter reason: The reason the engine opened.
    func engineDidOpen(reason: String)

-    /// Called when the engine receives a ping message. Only called in socket.io >3.
+    /// Called when the engine receives a ping message.
    func engineDidReceivePing()

-    /// Called when the engine receives a pong message. Only called in socket.io 2.
-    func engineDidReceivePong()
-
-    /// Called when the engine sends a ping to the server. Only called in socket.io 2.
-    func engineDidSendPing()
-
-    /// Called when the engine sends a pong to the server. Only called in socket.io >3.
+    /// Called when the engine sends a pong to the server.
    func engineDidSendPong()

    /// Called when the engine has a message that must be parsed.
--- a/Source/SocketIO/Engine/SocketEnginePollable.swift
+++ b/Source/SocketIO/Engine/SocketEnginePollable.swift
@ -79,15 +79,7 @@ extension SocketEnginePollable {
            postWait.removeAll(keepingCapacity: true)
        }

-        var postStr = ""
-
-        if version.rawValue >= 3 {
-            postStr = postWait.lazy.map({ $0.msg }).joined(separator: "\u{1e}")
-        } else {
-            for packet in postWait {
-                postStr += "\(packet.msg.utf16.count):\(packet.msg)"
-            }
-        }
+        let postStr = postWait.lazy.map({ $0.msg }).joined(separator: "\u{1e}")

        DefaultSocketLogger.Logger.log("Created POST string: \(postStr)", type: "SocketEnginePolling")

@ -203,29 +195,10 @@ extension SocketEnginePollable {

        DefaultSocketLogger.Logger.log("Got poll message: \(str)", type: "SocketEnginePolling")

-        if version.rawValue >= 3 {
-            let records = str.components(separatedBy: "\u{1e}")
+        let records = str.components(separatedBy: "\u{1e}")

-            for record in records {
-                parseEngineMessage(record)
-            }
-        } else {
-            guard str.count != 1 else {
-                parseEngineMessage(str)
-
-                return
-            }
-
-            var reader = SocketStringReader(message: str)
-
-            while reader.hasNext {
-                if let n = Int(reader.readUntilOccurence(of: ":")) {
-                    parseEngineMessage(reader.read(count: n))
-                } else {
-                    parseEngineMessage(str)
-                    break
-                }
-            }
+        for record in records {
+            parseEngineMessage(record)
        }
    }

--- a/Source/SocketIO/Engine/SocketEngineSpec.swift
+++ b/Source/SocketIO/Engine/SocketEngineSpec.swift
@ -27,7 +27,7 @@ import Foundation
 import Starscream

 /// Specifies a SocketEngine.
-public protocol SocketEngineSpec: AnyObject {
+public protocol SocketEngineSpec: class {
    // MARK: Properties

    /// The client for this engine.
@ -81,9 +81,6 @@ public protocol SocketEngineSpec: AnyObject {
    /// The url for WebSockets.
    var urlWebSocket: URL { get }

-    /// The version of engine.io being used. Default is three.
-    var version: SocketIOVersion { get }
-
    /// If `true`, then the engine is currently in WebSockets mode.
    @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets")
    var websocket: Bool { get }
@ -145,23 +142,10 @@ public protocol SocketEngineSpec: AnyObject {
 }

 extension SocketEngineSpec {
-    var engineIOParam: String {
-        switch version {
-        case .two:
-            return "&EIO=3"
-        case .three:
-            return "&EIO=4"
-        }
-    }
-
    var urlPollingWithSid: URL {
        var com = URLComponents(url: urlPolling, resolvingAgainstBaseURL: false)!
        com.percentEncodedQuery = com.percentEncodedQuery! + "&sid=\(sid.urlEncode()!)"

-        if !com.percentEncodedQuery!.contains("EIO") {
-            com.percentEncodedQuery = com.percentEncodedQuery! + engineIOParam
-        }
-
        return com.url!
    }

@ -169,11 +153,6 @@ extension SocketEngineSpec {
        var com = URLComponents(url: urlWebSocket, resolvingAgainstBaseURL: false)!
        com.percentEncodedQuery = com.percentEncodedQuery! + (sid == "" ? "" : "&sid=\(sid.urlEncode()!)")

-        if !com.percentEncodedQuery!.contains("EIO") {
-            com.percentEncodedQuery = com.percentEncodedQuery! + engineIOParam
-        }
-
-
        return com.url!
    }

@ -193,12 +172,10 @@ extension SocketEngineSpec {
    }

    func createBinaryDataForSend(using data: Data) -> Either<Data, String> {
-        let prefixB64 = version.rawValue >= 3 ? "b" : "b4"
-
        if polling {
-            return .right(prefixB64 + data.base64EncodedString(options: Data.Base64EncodingOptions(rawValue: 0)))
+            return .right("b" + data.base64EncodedString(options: Data.Base64EncodingOptions(rawValue: 0)))
        } else {
-            return .left(version.rawValue >= 3 ? data : Data([0x4]) + data)
+            return .left(data)
        }
    }

--- a/Source/SocketIO/Manager/SocketManager.swift
+++ b/Source/SocketIO/Manager/SocketManager.swift
@ -119,8 +119,6 @@ open class SocketManager: NSObject, SocketManagerSpec, SocketParsable, SocketDat
        }
    }

-    public private(set) var version = SocketIOVersion.three
-
    /// A list of packets that are waiting for binary data.
    ///
    /// The way that socket.io works all data should be sent directly after each packet.
@ -132,7 +130,7 @@ open class SocketManager: NSObject, SocketManagerSpec, SocketParsable, SocketDat
    private(set) var reconnectAttempts = -1

    private var _config: SocketIOClientConfiguration
-    internal var currentReconnectAttempt = 0
+    private var currentReconnectAttempt = 0
    private var reconnecting = false

    // MARK: Initializers
@ -186,8 +184,9 @@ open class SocketManager: NSObject, SocketManagerSpec, SocketParsable, SocketDat
    ///
    /// Override if you wish to attach a custom `SocketEngineSpec`.
    open func connect() {
-        if status == .connected || (status == .connecting && currentReconnectAttempt == 0) {
+        guard !status.active else {
            DefaultSocketLogger.Logger.log("Tried connecting an already active socket", type: SocketManager.logType)
+
            return
        }

@ -203,8 +202,7 @@ open class SocketManager: NSObject, SocketManagerSpec, SocketParsable, SocketDat
    /// Connects a socket through this manager's engine.
    ///
    /// - parameter socket: The socket who we should connect through this manager.
-    /// - parameter withPayload: Optional payload to send on connect
-    open func connectSocket(_ socket: SocketIOClient, withPayload payload: [String: Any]? = nil) {
+    open func connectSocket(_ socket: SocketIOClient) {
        guard status == .connected else {
            DefaultSocketLogger.Logger.log("Tried connecting socket when engine isn't open. Connecting",
                                           type: SocketManager.logType)
@ -213,15 +211,7 @@ open class SocketManager: NSObject, SocketManagerSpec, SocketParsable, SocketDat
            return
        }

-        var payloadStr = ""
-
-        if version.rawValue >= 3 && payload != nil,
-           let payloadData = try? JSONSerialization.data(withJSONObject: payload!, options: .fragmentsAllowed),
-           let jsonString = String(data: payloadData, encoding: .utf8) {
-            payloadStr = jsonString
-        }
-
-        engine?.send("0\(socket.nsp),\(payloadStr)", withData: [])
+        engine?.send("0\(socket.nsp),", withData: [])
    }

    /// Called when the manager has disconnected from socket.io.
@ -350,20 +340,12 @@ open class SocketManager: NSObject, SocketManagerSpec, SocketParsable, SocketDat

        status = .connected

-        if version.rawValue < 3 {
-            nsps["/"]?.didConnect(toNamespace: "/", payload: nil)
-        }
-
-        for (nsp, socket) in nsps where socket.status == .connecting {
-            if version.rawValue < 3 && nsp == "/" {
-                continue
-            }
-
-            connectSocket(socket, withPayload: socket.connectPayload)
+        for (_, socket) in nsps where socket.status == .connecting {
+            connectSocket(socket)
        }
    }

-    /// Called when the engine receives a ping message.
+    /// Called when the engine receives a pong message.
    open func engineDidReceivePing() {
        handleQueue.async {
            self._engineDidReceivePing()
@ -375,28 +357,6 @@ open class SocketManager: NSObject, SocketManagerSpec, SocketParsable, SocketDat
    }

    /// Called when the sends a ping to the server.
-    open func engineDidSendPing() {
-        handleQueue.async {
-            self._engineDidSendPing()
-        }
-    }
-
-    private func _engineDidSendPing() {
-        emitAll(clientEvent: .ping, data: [])
-    }
-
-    /// Called when the engine receives a pong message.
-    open func engineDidReceivePong() {
-        handleQueue.async {
-            self._engineDidReceivePong()
-        }
-    }
-
-    private func _engineDidReceivePong() {
-        emitAll(clientEvent: .pong, data: [])
-    }
-
-    /// Called when the sends a pong to the server.
    open func engineDidSendPong() {
        handleQueue.async {
            self._engineDidSendPong()
@ -539,13 +499,13 @@ open class SocketManager: NSObject, SocketManagerSpec, SocketParsable, SocketDat
        for option in config {
            switch option {
            case let .forceNew(new):
-                forceNew = new
+                self.forceNew = new
            case let .handleQueue(queue):
-                handleQueue = queue
+                self.handleQueue = queue
            case let .reconnects(reconnects):
                self.reconnects = reconnects
            case let .reconnectAttempts(attempts):
-                reconnectAttempts = attempts
+                self.reconnectAttempts = attempts
            case let .reconnectWait(wait):
                reconnectWait = abs(wait)
            case let .reconnectWaitMax(wait):
@ -556,8 +516,6 @@ open class SocketManager: NSObject, SocketManagerSpec, SocketParsable, SocketDat
                DefaultSocketLogger.Logger.log = log
            case let .logger(logger):
                DefaultSocketLogger.Logger = logger
-            case let .version(num):
-                version = num
            case _:
                continue
            }
--- a/Source/SocketIO/Manager/SocketManagerSpec.swift
+++ b/Source/SocketIO/Manager/SocketManagerSpec.swift
@ -45,7 +45,7 @@ import Foundation
 /// To disconnect a socket and remove it from the manager, either call `SocketIOClient.disconnect()` on the socket,
 /// or call one of the `disconnectSocket` methods on this class.
 ///
-public protocol SocketManagerSpec : SocketEngineClient {
+public protocol SocketManagerSpec : AnyObject, SocketEngineClient {
    // MARK: Properties

    /// Returns the socket associated with the default namespace ("/").
@ -83,9 +83,6 @@ public protocol SocketManagerSpec : SocketEngineClient {
    /// The status of this manager.
    var status: SocketIOStatus { get }

-    /// The version of socket.io in use.
-    var version: SocketIOVersion { get }
-
    // MARK: Methods

    /// Connects the underlying transport.
@ -94,8 +91,7 @@ public protocol SocketManagerSpec : SocketEngineClient {
    /// Connects a socket through this manager's engine.
    ///
    /// - parameter socket: The socket who we should connect through this manager.
-    /// - parameter withPayload: Optional payload to send on connect
-    func connectSocket(_ socket: SocketIOClient, withPayload: [String: Any]?)
+    func connectSocket(_ socket: SocketIOClient)

    /// Called when the manager has disconnected from socket.io.
    ///
--- a/Source/SocketIO/Util/SocketExtensions.swift
+++ b/Source/SocketIO/Util/SocketExtensions.swift
@ -87,9 +87,7 @@ extension Dictionary where Key == String, Value == Any {
            return compress ? .compress : nil
        case let ("enableSOCKSProxy", enable as Bool):
            return .enableSOCKSProxy(enable)
-        case let ("version", version as Int):
-            return .version(SocketIOVersion(rawValue: version) ?? .three)
-        case _:
+        default:
            return nil
        }
    }
--- a/Tests/TestSocketIO/SocketAckManagerTest.swift
+++ b/Tests/TestSocketIO/SocketAckManagerTest.swift
@ -28,6 +28,7 @@ class SocketAckManagerTest : XCTestCase {

    func testManagerTimeoutAck() {
        let callbackExpection = expectation(description: "Manager should timeout ack with noAck status")
+        let itemsArray = ["Hi", "ho"]

        func callback(_ items: [Any]) {
            XCTAssertEqual(items.count, 1, "Timed out ack should have one value")
--- a/Tests/TestSocketIO/SocketEngineTest.swift
+++ b/Tests/TestSocketIO/SocketEngineTest.swift
@ -10,19 +10,6 @@ import XCTest
@testable import SocketIO

 class SocketEngineTest: XCTestCase {
-    func testBasicPollingMessageV3() {
-        let expect = expectation(description: "Basic polling test v3")
-
-        socket.on("blankTest") {data, ack in
-            expect.fulfill()
-        }
-
-        engine.setConfigs([.version(.two)])
-        engine.parsePollingMessage("15:42[\"blankTest\"]")
-
-        waitForExpectations(timeout: 3, handler: nil)
-    }
-
    func testBasicPollingMessage() {
        let expect = expectation(description: "Basic polling test")
        socket.on("blankTest") {data, ack in
@ -96,15 +83,15 @@ class SocketEngineTest: XCTestCase {
            "created": "2016-05-04T18:31:15+0200"
        ]

-        XCTAssertEqual(engine.urlPolling.query, "transport=polling&b64=1&created=2016-05-04T18%3A31%3A15%2B0200&EIO=4")
-        XCTAssertEqual(engine.urlWebSocket.query, "transport=websocket&created=2016-05-04T18%3A31%3A15%2B0200&EIO=4")
+        XCTAssertEqual(engine.urlPolling.query, "transport=polling&b64=1&created=2016-05-04T18%3A31%3A15%2B0200")
+        XCTAssertEqual(engine.urlWebSocket.query, "transport=websocket&created=2016-05-04T18%3A31%3A15%2B0200")

        engine.connectParams = [
            "forbidden": "!*'();:@&=+$,/?%#[]\" {}^|"
        ]

-        XCTAssertEqual(engine.urlPolling.query, "transport=polling&b64=1&forbidden=%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%2F%3F%25%23%5B%5D%22%20%7B%7D%5E%7C&EIO=4")
-        XCTAssertEqual(engine.urlWebSocket.query, "transport=websocket&forbidden=%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%2F%3F%25%23%5B%5D%22%20%7B%7D%5E%7C&EIO=4")
+        XCTAssertEqual(engine.urlPolling.query, "transport=polling&b64=1&forbidden=%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%2F%3F%25%23%5B%5D%22%20%7B%7D%5E%7C")
+        XCTAssertEqual(engine.urlWebSocket.query, "transport=websocket&forbidden=%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%2F%3F%25%23%5B%5D%22%20%7B%7D%5E%7C")
    }

    func testBase64Data() {
--- a/Tests/TestSocketIO/SocketMangerTest.swift
+++ b/Tests/TestSocketIO/SocketMangerTest.swift
@ -60,44 +60,6 @@ class SocketMangerTest : XCTestCase {
        waitForExpectations(timeout: 0.3)
    }

-    func testManagerDoesNotCallConnectWhenConnectingWithLessThanOneReconnect() {
-        setUpSockets()
-        
-        let expect = expectation(description: "The manager should not call connect on the engine")
-        expect.isInverted = true
-        
-        let engine = TestEngine(client: manager, url: manager.socketURL, options: nil)
-        
-        engine.onConnect = {
-            expect.fulfill()
-        }
-        manager.setTestStatus(.connecting)
-        manager.setCurrentReconnect(currentReconnect: 0)
-        manager.engine = engine
-        
-        manager.connect()
-
-        waitForExpectations(timeout: 0.3)
-    }
-    
-    func testManagerCallConnectWhenConnectingAndMoreThanOneReconnect() {
-        setUpSockets()
-        
-        let expect = expectation(description: "The manager should call connect on the engine")
-        let engine = TestEngine(client: manager, url: manager.socketURL, options: nil)
-        
-        engine.onConnect = {
-            expect.fulfill()
-        }
-        manager.setTestStatus(.connecting)
-        manager.setCurrentReconnect(currentReconnect: 1)
-        manager.engine = engine
-        
-        manager.connect()
-
-        waitForExpectations(timeout: 0.8)
-    }
-
    func testManagerCallsDisconnect() {
        setUpSockets()

@ -192,10 +154,6 @@ public enum ManagerExpectation: String {
 }

 public class TestManager: SocketManager {
-    public func setCurrentReconnect(currentReconnect: Int) {
-        self.currentReconnectAttempt = currentReconnect
-    }
-    
    public override func disconnect() {
        setTestStatus(.disconnected)
    }
--- a/Tests/TestSocketIO/SocketSideEffectTest.swift
+++ b/Tests/TestSocketIO/SocketSideEffectTest.swift
@ -454,7 +454,7 @@ class SocketSideEffectTest: XCTestCase {
    }
 }

-struct ThrowingData: SocketData {
+struct ThrowingData : SocketData {
    enum ThrowingError : Error {
        case error
    }
@ -465,7 +465,7 @@ struct ThrowingData: SocketData {

 }

-class TestEngine: SocketEngineSpec {
+class TestEngine : SocketEngineSpec {
    weak var client: SocketEngineClient?
    private(set) var closed = false
    private(set) var compress = false
@ -485,9 +485,8 @@ class TestEngine: SocketEngineSpec {
    private(set) var urlWebSocket = URL(string: "http://localhost/")!
    private(set) var websocket = false
    private(set) var ws: WebSocket? = nil
-    private(set) var version = SocketIOVersion.three

-    internal var onConnect: (() -> ())?
+    fileprivate var onConnect: (() -> ())?

    required init(client: SocketEngineClient, url: URL, options: [String: Any]?) {
        self.client = client
--- a/Docs/15to16.md
+++ b/Docs/15to16.md
@ -1,35 +0,0 @@
-# Upgrading from v15 to v16
-
-This guide will help you navigate the changes that were introduced in v16.
-
-## Objective-c is no longer supported. You must now use Swift.
-
-## Client supports multiple socket.io versions
-
-The client now supports socket.io 3 servers. This is mostly a transparent change, however if your server
-is socket.io 2, you must send `.version(.two)` as an option to the manager.
-
-```swift
-SocketManager(socketURL: URL(string:"http://localhost:8087/")!, config: [.version(.two)])
-```
-
-## How to upgrade
-
- first, upgrade the Socket.IO server to v4 with the compatibility mode enabled (`allowEIO3: true`)
- then, upgrade the clients to v16
- finally, once all clients have upgraded, disable the compatibility mode
-
-You can check the version of the connection on the server side with:
-
-```js
-io.on("connection", (socket) => {
-  // either 3 for the 3rd revision of the protocol (Socket.IO v2) or 4 for the 4th revision (Socket.IO v3/v4)
-  const version = socket.conn.protocol;
-});
-```
-
-See also:
-
- [Compatibility table](https://nuclearace.github.io/Socket.IO-Client-Swift/Compatibility.html)
- Migrating from 2.x to 3.0: https://socket.io/docs/v4/migrating-from-2-x-to-3-0/
- Migrating from 3.x to 4.0: https://socket.io/docs/v4/migrating-from-3-x-to-4-0/
--- a/Docs/Compatibility.md
+++ b/Docs/Compatibility.md
@ -1,61 +0,0 @@
-Here is the compatibility table with the Node.js server:
-
-<table>
-    <tr>
-        <th rowspan="2">Swift Client version</th>
-        <th colspan="3">Socket.IO server version</th>
-    </tr>
-    <tr>
-        <td align="center">2.x</td>
-        <td align="center">3.x</td>
-        <td align="center">4.x</td>
-    </tr>
-    <tr>
-        <td align="center">v15.x</td>
-        <td align="center"><b>YES</b></td>
-        <td align="center"><b>YES</b><sup>1</sup></td>
-        <td align="center"><b>YES</b><sup>2</sup></td>
-    </tr>
-    <tr>
-        <td align="center">v16.x</td>
-        <td align="center"><b>YES</b><sup>3</sup></td>
-        <td align="center"><b>YES</b></td>
-        <td align="center"><b>YES</b></td>
-    </tr>
-</table>
-
-[1] Yes, with <code><a href="https://socket.io/docs/v4/server-initialization/#allowEIO3">allowEIO3: true</a></code> (server) and `.connectParams(["EIO": "3"])` (client):
-
-*Server*
-
-```js
-const { createServer } = require("http");
-const { Server } = require("socket.io");
-
-const httpServer = createServer();
-const io = new Server(httpServer, {
-  allowEIO3: true
-});
-
-httpServer.listen(8080);
-```
-
-*Client*
-
-```swift
-SocketManager(socketURL: URL(string:"http://localhost:8080/")!, config: [.connectParams(["EIO": "3"])])
-```
-
-[2] Yes, <code><a href="https://socket.io/docs/v4/server-initialization/#allowEIO3">allowEIO3: true</a></code> (server)
-
-[3] Yes, with `.version(.two)` (client):
-
-```swift
-SocketManager(socketURL: URL(string:"http://localhost:8080/")!, config: [.version(.two)])
-```
-
-See also:
-
- Migrating from 2.x to 3.0: https://socket.io/docs/v4/migrating-from-2-x-to-3-0/
- Migrating from 3.x to 4.0: https://socket.io/docs/v4/migrating-from-3-x-to-4-0/
- Socket.IO protocol: https://github.com/socketio/socket.io-protocol
--- a/docs/12to13.html
+++ b/docs/12to13.html
@ -20,7 +20,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -49,9 +49,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="faq.html">FAQ</a>
              </li>
@ -63,6 +60,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -104,55 +104,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -227,7 +183,7 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            
            <h1 id='upgrading-from-v12' class='heading'>Upgrading from v12</h1>

@ -239,8 +195,8 @@ the swift client now only uses one engine per connection. Previously in order to
 to create multiple clients, and each client had its own engine.</p>

 <p>Some v12 code might&rsquo;ve looked like this:</p>
-<pre class="highlight swift"><code><span class="k">let</span> <span class="nv">defaultSocket</span> <span class="o">=</span> <span class="kt">SocketIOClient</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="n">myURL</span><span class="p">)</span>
-<span class="k">let</span> <span class="nv">namespaceSocket</span> <span class="o">=</span> <span class="kt">SocketIOClient</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="n">myURL</span><span class="p">,</span> <span class="nv">config</span><span class="p">:</span> <span class="p">[</span><span class="o">.</span><span class="nf">nsp</span><span class="p">(</span><span class="s">"/swift"</span><span class="p">)])</span>
+<pre class="highlight swift"><code><span class="k">let</span> <span class="nv">defaultSocket</span> <span class="o">=</span> <span class="nf">SocketIOClient</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="n">myURL</span><span class="p">)</span>
+<span class="k">let</span> <span class="nv">namespaceSocket</span> <span class="o">=</span> <span class="nf">SocketIOClient</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="n">myURL</span><span class="p">,</span> <span class="nv">config</span><span class="p">:</span> <span class="p">[</span><span class="o">.</span><span class="nf">nsp</span><span class="p">(</span><span class="s">"/swift"</span><span class="p">)])</span>

 <span class="c1">// add handlers for sockets and connect</span>

@ -249,7 +205,7 @@ to create multiple clients, and each client had its own engine.</p>
 <p>In v12 this would have opened two connections to the socket.io.</p>

 <p>In v13 the same code would look like this:</p>
-<pre class="highlight swift"><code><span class="k">let</span> <span class="nv">manager</span> <span class="o">=</span> <span class="kt">SocketManager</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="n">myURL</span><span class="p">)</span>
+<pre class="highlight swift"><code><span class="k">let</span> <span class="nv">manager</span> <span class="o">=</span> <span class="nf">SocketManager</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="n">myURL</span><span class="p">)</span>
 <span class="k">let</span> <span class="nv">defaultSocket</span> <span class="o">=</span> <span class="n">manager</span><span class="o">.</span><span class="n">defaultSocket</span>
 <span class="k">let</span> <span class="nv">namespaceSocket</span> <span class="o">=</span> <span class="n">manager</span><span class="o">.</span><span class="nf">socket</span><span class="p">(</span><span class="nv">forNamespace</span><span class="p">:</span> <span class="s">"/swift"</span><span class="p">)</span>

@ -280,9 +236,9 @@ associated with that namespace.</p></li>
 <p>You should know that <code><a href="Classes/SocketIOClient.html">SocketIOClient</a></code>s no longer need to be held around in properties, but the <code><a href="Classes/SocketManager.html">SocketManager</a></code> should.</p>

 <p>One of the most common mistakes people made is not maintaining a strong reference to the client.</p>
-<pre class="highlight swift"><code><span class="kd">class</span> <span class="kt">Manager</span> <span class="p">{</span>
+<pre class="highlight swift"><code><span class="kd">class</span> <span class="nf">Manager</span> <span class="p">{</span>
    <span class="kd">func</span> <span class="nf">addHandlers</span><span class="p">()</span> <span class="p">{</span>
-        <span class="k">let</span> <span class="nv">socket</span> <span class="o">=</span> <span class="kt">SocketIOClient</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="n">myURL</span><span class="p">,</span> <span class="nv">config</span><span class="p">:</span> <span class="p">[</span><span class="o">.</span><span class="nf">nsp</span><span class="p">(</span><span class="s">"/swift"</span><span class="p">)])</span>
+        <span class="k">let</span> <span class="nv">socket</span> <span class="o">=</span> <span class="nf">SocketIOClient</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="n">myURL</span><span class="p">,</span> <span class="nv">config</span><span class="p">:</span> <span class="p">[</span><span class="o">.</span><span class="nf">nsp</span><span class="p">(</span><span class="s">"/swift"</span><span class="p">)])</span>

        <span class="c1">// Add handlers</span>
    <span class="p">}</span>
@ -292,8 +248,8 @@ associated with that namespace.</p></li>
 <p>This would have resulted in the client being released and no handlers being called.</p>

 <p>A <em>correct</em> equivalent would be:</p>
-<pre class="highlight swift"><code><span class="kd">class</span> <span class="kt">Manager</span> <span class="p">{</span>
-    <span class="k">let</span> <span class="nv">socketManager</span> <span class="o">=</span> <span class="kt">SocketManager</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="n">someURL</span><span class="p">)</span>
+<pre class="highlight swift"><code><span class="kd">class</span> <span class="nf">Manager</span> <span class="p">{</span>
+    <span class="k">let</span> <span class="nv">socketManager</span> <span class="o">=</span> <span class="nf">SocketManager</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="n">someURL</span><span class="p">)</span>

    <span class="kd">func</span> <span class="nf">addHandlers</span><span class="p">()</span> <span class="p">{</span>
        <span class="k">let</span> <span class="nv">socket</span> <span class="o">=</span> <span class="n">socketManager</span><span class="o">.</span><span class="nf">socket</span><span class="p">(</span><span class="nv">forNamespace</span><span class="p">:</span> <span class="s">"/swift"</span><span class="p">)</span>
@ -312,7 +268,7 @@ multiple managers.</strong></p>
 <h2 id='what-to-call-connect-on' class='heading'>What to call connect on</h2>

 <p>Connect can either be called on the manager directly, or on one of the sockets made from it. In either case, if the manager
-was not already connected to the server, a connection will be made. Also in both cases the default socket (namespace &ldquo;/&rdquo;)
+was not already connected to the server, a connection will be made. Also in both cases the default socket (namespace <q>/</q>)
 will fire a <code>connect</code> event. </p>

 <p>The difference is that if <code>connect()</code> is just called on the manager, then any sockets for that manager that are not the default
@ -327,8 +283,8 @@ and a <code>connect</code> event fired.</p>
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/15to16.html
+++ b/docs/15to16.html
@ -1,255 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>15to16  Reference</title>
-    <link rel="stylesheet" type="text/css" href="css/jazzy.css" />
-    <link rel="stylesheet" type="text/css" href="css/highlight.css" />
-    <meta charset="utf-8">
-    <script src="js/jquery.min.js" defer></script>
-    <script src="js/jazzy.js" defer></script>
-    
-    <script src="js/lunr.min.js" defer></script>
-    <script src="js/typeahead.jquery.js" defer></script>
-    <script src="js/jazzy.search.js" defer></script>
-  </head>
-  <body>
-
-
-    <a title="15to16  Reference"></a>
-
-    <header class="header">
-      <p class="header-col header-col--primary">
-        <a class="header-link" href="index.html">
-          SocketIO 16.0.0 Docs
-        </a>
-         (100% documented)
-      </p>
-    
-      <p class="header-col--secondary">
-        <form role="search" action="search.json">
-          <input type="text" placeholder="Search documentation" data-typeahead>
-        </form>
-      </p>
-    
-    
-    </header>
-
-    <p class="breadcrumbs">
-      <a class="breadcrumb" href="index.html">SocketIO Reference</a>
-      <img class="carat" src="img/carat.png" />
-      15to16  Reference
-    </p>
-
-    <div class="content-wrapper">
-      <nav class="navigation">
-        <ul class="nav-groups">
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Guides.html">Guides</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="12to13.html">12to13</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="15to16.html">15to16</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="faq.html">FAQ</a>
-              </li>
-            </ul>
-          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Classes.html">Classes</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Classes/OnAckCallback.html">OnAckCallback</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Classes/SocketAckEmitter.html">SocketAckEmitter</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Classes/SocketAnyEvent.html">SocketAnyEvent</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Classes/SocketEngine.html">SocketEngine</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Classes/SocketIOClient.html">SocketIOClient</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Classes/SocketManager.html">SocketManager</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Classes/SocketRawAckView.html">SocketRawAckView</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Classes/SocketRawView.html">SocketRawView</a>
-              </li>
-            </ul>
-          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Enums.html">Enumerations</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketAckStatus.html">SocketAckStatus</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketClientEvent.html">SocketClientEvent</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketEnginePacketType.html">SocketEnginePacketType</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketIOClientOption.html">SocketIOClientOption</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketIOStatus.html">SocketIOStatus</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketParsableError.html">SocketParsableError</a>
-              </li>
-            </ul>
-          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Protocols.html">Protocols</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/ConfigSettable.html">ConfigSettable</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketData.html">SocketData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketDataBufferable.html">SocketDataBufferable</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketEngineClient.html">SocketEngineClient</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketEnginePollable.html">SocketEnginePollable</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketEngineSpec.html">SocketEngineSpec</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketEngineWebsocket.html">SocketEngineWebsocket</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketIOClientSpec.html">SocketIOClientSpec</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketLogger.html">SocketLogger</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketManagerSpec.html">SocketManagerSpec</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketParsable.html">SocketParsable</a>
-              </li>
-            </ul>
-          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Structs.html">Structures</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Structs/SocketEventHandler.html">SocketEventHandler</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Structs/SocketIOClientConfiguration.html">SocketIOClientConfiguration</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Structs/SocketPacket.html">SocketPacket</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Structs/SocketPacket/PacketType.html">– PacketType</a>
-              </li>
-            </ul>
-          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Typealiases.html">Type Aliases</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Typealiases.html#/s:8SocketIO11AckCallbacka">AckCallback</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Typealiases.html#/s:8SocketIO14NormalCallbacka">NormalCallback</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Typealiases.html#/s:8SocketIO4Posta">Post</a>
-              </li>
-            </ul>
-          </li>
-        </ul>
-      </nav>
-      <article class="main-content">
-
-        <section class="section">
-          <div class="section-content top-matter">
-            
-            <h1 id='upgrading-from-v15-to-v16' class='heading'>Upgrading from v15 to v16</h1>
-
-<p>This guide will help you navigate the changes that were introduced in v16.</p>
-<h2 id='objective-c-is-no-longer-supported-you-must-now-use-swift' class='heading'>Objective-c is no longer supported. You must now use Swift.</h2>
-<h2 id='client-supports-multiple-socket-io-versions' class='heading'>Client supports multiple socket.io versions</h2>
-
-<p>The client now supports socket.io 3 servers. This is mostly a transparent change, however if your sever
-is socket.io 2, you must send <code>.version(.two)</code> as an option to the manager.</p>
-<pre class="highlight swift"><code><span class="kt">SocketManager</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="kt">URL</span><span class="p">(</span><span class="nv">string</span><span class="p">:</span><span class="s">"http://localhost:8087/"</span><span class="p">)</span><span class="o">!</span><span class="p">,</span> <span class="nv">config</span><span class="p">:</span> <span class="p">[</span><span class="o">.</span><span class="nf">version</span><span class="p">(</span><span class="o">.</span><span class="n">two</span><span class="p">)])</span>
-</code></pre>
-
-          </div>
-        </section>
-
-
-      </article>
-    </div>
-    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
-    </section>
-  </body>
-</div>
-</html>
--- a/docs/Classes.html
+++ b/docs/Classes.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,7 +184,7 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>Classes</h1>
            <p>The following classes are available globally.</p>

@ -303,6 +259,10 @@ Example:</p>
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
@ -331,6 +291,10 @@ Example:</p>
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
@ -370,6 +334,10 @@ Example:</p>
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
@ -434,6 +402,10 @@ Example:</p>
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
@ -456,14 +428,17 @@ See <code><a href="Protocols/SocketEnginePollable.html">SocketEnginePollable</a>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">open</span> <span class="kd">class</span> <span class="kt">SocketEngine</span><span class="p">:</span>
-        <span class="kt">NSObject</span><span class="p">,</span> <span class="kt">WebSocketDelegate</span><span class="p">,</span> <span class="kt">URLSessionDelegate</span><span class="p">,</span> <span class="kt"><a href="Protocols/SocketEnginePollable.html">SocketEnginePollable</a></span><span class="p">,</span> <span class="kt"><a href="Protocols/SocketEngineWebsocket.html">SocketEngineWebsocket</a></span><span class="p">,</span> <span class="kt"><a href="Protocols/ConfigSettable.html">ConfigSettable</a></span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">open</span> <span class="kd">class</span> <span class="kt">SocketEngine</span> <span class="p">:</span> <span class="kt">NSObject</span><span class="p">,</span> <span class="kt">URLSessionDelegate</span><span class="p">,</span> <span class="kt"><a href="Protocols/SocketEnginePollable.html">SocketEnginePollable</a></span><span class="p">,</span> <span class="kt"><a href="Protocols/SocketEngineWebsocket.html">SocketEngineWebsocket</a></span><span class="p">,</span> <span class="kt"><a href="Protocols/ConfigSettable.html">ConfigSettable</a></span></code></pre>

                        </div>
                      </div>
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
@ -482,7 +457,7 @@ See <code><a href="Protocols/SocketEnginePollable.html">SocketEnginePollable</a>
 <p>A <code>SocketManager</code> is responsible for multiplexing multiple namespaces through a single <code><a href="Protocols/SocketEngineSpec.html">SocketEngineSpec</a></code>.</p>

 <p>Example:</p>
-<pre class="highlight swift"><code><span class="k">let</span> <span class="nv">manager</span> <span class="o">=</span> <span class="kt">SocketManager</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="kt">URL</span><span class="p">(</span><span class="nv">string</span><span class="p">:</span><span class="s">"http://localhost:8080/"</span><span class="p">)</span><span class="o">!</span><span class="p">)</span>
+<pre class="highlight swift"><code><span class="k">let</span> <span class="nv">manager</span> <span class="o">=</span> <span class="nf">SocketManager</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="nf">URL</span><span class="p">(</span><span class="nv">string</span><span class="p">:</span><span class="s">"http://localhost:8080/"</span><span class="p">)</span><span class="o">!</span><span class="p">)</span>
 <span class="k">let</span> <span class="nv">defaultNamespaceSocket</span> <span class="o">=</span> <span class="n">manager</span><span class="o">.</span><span class="n">defaultSocket</span>
 <span class="k">let</span> <span class="nv">swiftSocket</span> <span class="o">=</span> <span class="n">manager</span><span class="o">.</span><span class="nf">socket</span><span class="p">(</span><span class="nv">forNamespace</span><span class="p">:</span> <span class="s">"/swift"</span><span class="p">)</span>

@ -492,7 +467,7 @@ See <code><a href="Protocols/SocketEnginePollable.html">SocketEnginePollable</a>
 <p>Sockets created through the manager are retained by the manager. So at the very least, a single strong reference
 to the manager must be maintained to keep sockets alive.</p>

-<p>To disconnect a socket and remove it from the manager, either call <code><a href="Classes/SocketIOClient.html#/s:8SocketIO0A8IOClientC10disconnectyyF">SocketIOClient.disconnect()</a></code> on the socket,
+<p>To disconnect a socket and remove it from the manager, either call <code><a href="Classes/SocketIOClient.html#/c:@M@SocketIO@objc(cs)SocketIOClient(im)disconnect">SocketIOClient.disconnect()</a></code> on the socket,
 or call one of the <code>disconnectSocket</code> methods on this class.</p>

 <p><strong>NOTE</strong>: The manager is not thread/queue safe, all interaction with the manager should be done on the <code>handleQueue</code></p>
@ -512,14 +487,46 @@ or call one of the <code>disconnectSocket</code> methods on this class.</p>
                </li>
              </ul>
            </div>
+            <div class="task-group">
+              <ul class="item-container">
+                <li class="item">
+                  <div>
+                    <code>
+                    <a name="/c:@M@SocketIO@objc(cs)SSLSecurity"></a>
+                    <a name="//apple_ref/swift/Class/SSLSecurity" class="dashAnchor"></a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SSLSecurity">SSLSecurity</a>
+                    </code>
+                  </div>
+                  <div class="height-container">
+                    <div class="pointer-container"></div>
+                    <section class="section">
+                      <div class="pointer"></div>
+                      <div class="abstract">
+                        <p>A wrapper around Starscream&rsquo;s SSLSecurity that provides a minimal Objective-C interface.</p>
+
+                        <a href="Classes/SSLSecurity.html" class="slightly-smaller">See more</a>
+                      </div>
+                      <div class="declaration">
+                        <h4>Declaration</h4>
+                        <div class="language">
+                          <p class="aside-title">Swift</p>
+                          <pre class="highlight swift"><code><span class="kd">open</span> <span class="kd">class</span> <span class="kt">SSLSecurity</span> <span class="p">:</span> <span class="kt">NSObject</span></code></pre>
+
+                        </div>
+                      </div>
+                    </section>
+                  </div>
+                </li>
+              </ul>
+            </div>
          </div>
        </section>

      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Classes/OnAckCallback.html
+++ b/docs/Classes/OnAckCallback.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>OnAckCallback</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">final</span> <span class="kd">class</span> <span class="kt">OnAckCallback</span> <span class="p">:</span> <span class="kt">NSObject</span></code></pre>

                </div>
@ -254,11 +209,9 @@ Example:</p>
              <div class="task-name-container">
                <a name="/Methods"></a>
                <a name="//apple_ref/swift/Section/Methods" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Methods"></a>
-                  <h3 class="section-name"><p>Methods</p>
-</h3>
-                </div>
+                <a href="#/Methods">
+                  <h3 class="section-name">Methods</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -266,7 +219,7 @@ Example:</p>
                    <code>
                    <a name="/c:@M@SocketIO@objc(cs)OnAckCallback(im)timingOutAfter:callback:"></a>
                    <a name="//apple_ref/swift/Method/timingOut(after:callback:)" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(cs)OnAckCallback(im)timingOutAfter:callback:">timingOut(after:<wbr>callback:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)OnAckCallback(im)timingOutAfter:callback:">timingOut(after:callback:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -329,8 +282,8 @@ Example:</p>
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Classes/SocketAckEmitter.html
+++ b/docs/Classes/SocketAckEmitter.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketAckEmitter</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">final</span> <span class="kd">class</span> <span class="kt">SocketAckEmitter</span> <span class="p">:</span> <span class="kt">NSObject</span></code></pre>

                </div>
@ -275,7 +230,7 @@
                        <div class="language">
                          <p class="aside-title">Swift</p>
                          <pre class="highlight swift"><code><span class="kd">@objc</span>
-<span class="kd">public</span> <span class="kd">private(set)</span> <span class="kd">lazy</span> <span class="k">var</span> <span class="nv">rawEmitView</span><span class="p">:</span> <span class="kt"><a href="../Classes/SocketRawAckView.html">SocketRawAckView</a></span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
+<span class="kd">public</span> <span class="kd">private(set)</span> <span class="kd">lazy</span> <span class="k">var</span> <span class="nv">rawEmitView</span><span class="p">:</span> <span class="nf">SocketRawAckView</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -288,11 +243,9 @@
              <div class="task-name-container">
                <a name="/Properties"></a>
                <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
-</h3>
-                </div>
+                <a href="#/Properties">
+                  <h3 class="section-name">Properties</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -315,7 +268,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">expected</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">expected</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -328,11 +281,9 @@
              <div class="task-name-container">
                <a name="/Initializers"></a>
                <a name="//apple_ref/swift/Section/Initializers" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Initializers"></a>
-                  <h3 class="section-name"><p>Initializers</p>
-</h3>
-                </div>
+                <a href="#/Initializers">
+                  <h3 class="section-name">Initializers</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -340,7 +291,7 @@
                    <code>
                    <a name="/s:8SocketIO0A10AckEmitterC6socket6ackNumAcA0A8IOClientC_Sitcfc"></a>
                    <a name="//apple_ref/swift/Method/init(socket:ackNum:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10AckEmitterC6socket6ackNumAcA0A8IOClientC_Sitcfc">init(socket:<wbr>ackNum:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A10AckEmitterC6socket6ackNumAcA0A8IOClientC_Sitcfc">init(socket:ackNum:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -399,11 +350,9 @@
              <div class="task-name-container">
                <a name="/Methods"></a>
                <a name="//apple_ref/swift/Section/Methods" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Methods"></a>
-                  <h3 class="section-name"><p>Methods</p>
-</h3>
-                </div>
+                <a href="#/Methods">
+                  <h3 class="section-name">Methods</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -411,7 +360,7 @@
                    <code>
                    <a name="/s:8SocketIO0A10AckEmitterC4withyyAA0A4Data_pd_tF"></a>
                    <a name="//apple_ref/swift/Method/with(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10AckEmitterC4withyyAA0A4Data_pd_tF">with(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A10AckEmitterC4withyyAA0A4Data_pd_tF">with(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -460,7 +409,7 @@ will be emitted. The structure of the error data is <code>[ackNum, items, theErr
                    <code>
                    <a name="/c:@M@SocketIO@objc(cs)SocketAckEmitter(im)with:"></a>
                    <a name="//apple_ref/swift/Method/with(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketAckEmitter(im)with:">with(_:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketAckEmitter(im)with:">with(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -510,8 +459,8 @@ will be emitted. The structure of the error data is <code>[ackNum, items, theErr
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Classes/SocketAnyEvent.html
+++ b/docs/Classes/SocketAnyEvent.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketAnyEvent</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">final</span> <span class="kd">class</span> <span class="kt">SocketAnyEvent</span> <span class="p">:</span> <span class="kt">NSObject</span></code></pre>

                </div>
@ -248,11 +203,9 @@
              <div class="task-name-container">
                <a name="/Properties"></a>
                <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
-</h3>
-                </div>
+                <a href="#/Properties">
+                  <h3 class="section-name">Properties</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -331,7 +284,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">override</span> <span class="kd">public</span> <span class="k">var</span> <span class="nv">description</span><span class="p">:</span> <span class="kt">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">override</span> <span class="kd">public</span> <span class="k">var</span> <span class="nv">description</span><span class="p">:</span> <span class="nf">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -346,8 +299,8 @@
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Classes/SocketEngine.html
+++ b/docs/Classes/SocketEngine.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,13 +184,11 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketEngine</h1>
              <div class="declaration">
                <div class="language">
-                  
-                  <pre class="highlight swift"><code><span class="kd">open</span> <span class="kd">class</span> <span class="kt">SocketEngine</span><span class="p">:</span>
-        <span class="kt">NSObject</span><span class="p">,</span> <span class="kt">WebSocketDelegate</span><span class="p">,</span> <span class="kt">URLSessionDelegate</span><span class="p">,</span> <span class="kt"><a href="../Protocols/SocketEnginePollable.html">SocketEnginePollable</a></span><span class="p">,</span> <span class="kt"><a href="../Protocols/SocketEngineWebsocket.html">SocketEngineWebsocket</a></span><span class="p">,</span> <span class="kt"><a href="../Protocols/ConfigSettable.html">ConfigSettable</a></span></code></pre>
+                  <pre class="highlight swift"><code><span class="kd">open</span> <span class="kd">class</span> <span class="kt">SocketEngine</span> <span class="p">:</span> <span class="kt">NSObject</span><span class="p">,</span> <span class="kt">URLSessionDelegate</span><span class="p">,</span> <span class="kt"><a href="../Protocols/SocketEnginePollable.html">SocketEnginePollable</a></span><span class="p">,</span> <span class="kt"><a href="../Protocols/SocketEngineWebsocket.html">SocketEngineWebsocket</a></span><span class="p">,</span> <span class="kt"><a href="../Protocols/ConfigSettable.html">ConfigSettable</a></span></code></pre>

                </div>
              </div>
@ -250,19 +204,17 @@ See <code><a href="../Protocols/SocketEnginePollable.html">SocketEnginePollable<
              <div class="task-name-container">
                <a name="/Properties"></a>
                <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
-</h3>
-                </div>
+                <a href="#/Properties">
+                  <h3 class="section-name">Properties</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC11engineQueueSo17OS_dispatch_queueCvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(py)engineQueue"></a>
                    <a name="//apple_ref/swift/Property/engineQueue" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC11engineQueueSo17OS_dispatch_queueCvp">engineQueue</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(py)engineQueue">engineQueue</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -287,9 +239,9 @@ See <code><a href="../Protocols/SocketEnginePollable.html">SocketEnginePollable<
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC13connectParamsSDySSypGSgvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(py)connectParams"></a>
                    <a name="//apple_ref/swift/Property/connectParams" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC13connectParamsSDySSypGSgvp">connectParams</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(py)connectParams">connectParams</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -314,9 +266,9 @@ See <code><a href="../Protocols/SocketEnginePollable.html">SocketEnginePollable<
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC12extraHeadersSDyS2SGSgvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(py)extraHeaders"></a>
                    <a name="//apple_ref/swift/Property/extraHeaders" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC12extraHeadersSDyS2SGSgvp">extraHeaders</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(py)extraHeaders">extraHeaders</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -430,9 +382,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC6closedSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(py)closed"></a>
                    <a name="//apple_ref/swift/Property/closed" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC6closedSbvp">closed</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(py)closed">closed</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -447,7 +399,9 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">closed</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">closed</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -457,9 +411,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC8compressSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(py)compress"></a>
                    <a name="//apple_ref/swift/Property/compress" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC8compressSbvp">compress</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(py)compress">compress</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -474,7 +428,9 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">compress</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">compress</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -484,9 +440,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC9connectedSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(py)connected"></a>
                    <a name="//apple_ref/swift/Property/connected" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC9connectedSbvp">connected</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(py)connected">connected</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -501,7 +457,9 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">connected</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">connected</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -511,9 +469,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC7cookiesSaySo12NSHTTPCookieCGSgvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(py)cookies"></a>
                    <a name="//apple_ref/swift/Property/cookies" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC7cookiesSaySo12NSHTTPCookieCGSgvp">cookies</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(py)cookies">cookies</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -528,7 +486,9 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">cookies</span><span class="p">:</span> <span class="p">[</span><span class="kt">HTTPCookie</span><span class="p">]?</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">cookies</span><span class="p">:</span> <span class="p">[</span><span class="kt">HTTPCookie</span><span class="p">]?</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -538,9 +498,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC11fastUpgradeSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(py)fastUpgrade"></a>
                    <a name="//apple_ref/swift/Property/fastUpgrade" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC11fastUpgradeSbvp">fastUpgrade</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(py)fastUpgrade">fastUpgrade</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -557,7 +517,9 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">fastUpgrade</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">fastUpgrade</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -567,9 +529,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC12forcePollingSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(py)forcePolling"></a>
                    <a name="//apple_ref/swift/Property/forcePolling" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC12forcePollingSbvp">forcePolling</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(py)forcePolling">forcePolling</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -584,7 +546,9 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">forcePolling</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">forcePolling</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -594,9 +558,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC15forceWebsocketsSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(py)forceWebsockets"></a>
                    <a name="//apple_ref/swift/Property/forceWebsockets" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC15forceWebsocketsSbvp">forceWebsockets</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(py)forceWebsockets">forceWebsockets</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -611,7 +575,9 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">forceWebsockets</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">forceWebsockets</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -638,7 +604,9 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">invalidated</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">invalidated</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -648,9 +616,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC7pollingSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(py)polling"></a>
                    <a name="//apple_ref/swift/Property/polling" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC7pollingSbvp">polling</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(py)polling">polling</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -665,7 +633,9 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">polling</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">polling</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -675,9 +645,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC7probingSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(py)probing"></a>
                    <a name="//apple_ref/swift/Property/probing" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC7probingSbvp">probing</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(py)probing">probing</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -692,7 +662,9 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">probing</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">probing</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -719,7 +691,9 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">session</span><span class="p">:</span> <span class="kt">URLSession</span><span class="p">?</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">session</span><span class="p">:</span> <span class="nf">URLSession</span><span class="p">?</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -729,9 +703,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC3sidSSvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(py)sid"></a>
                    <a name="//apple_ref/swift/Property/sid" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC3sidSSvp">sid</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(py)sid">sid</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -746,7 +720,9 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">sid</span><span class="p">:</span> <span class="kt">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">sid</span><span class="p">:</span> <span class="nf">String</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -756,9 +732,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC10socketPathSSvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(py)socketPath"></a>
                    <a name="//apple_ref/swift/Property/socketPath" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC10socketPathSSvp">socketPath</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(py)socketPath">socketPath</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -773,7 +749,9 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">socketPath</span><span class="p">:</span> <span class="kt">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">socketPath</span><span class="p">:</span> <span class="nf">String</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -783,9 +761,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC10urlPolling10Foundation3URLVvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(py)urlPolling"></a>
                    <a name="//apple_ref/swift/Property/urlPolling" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC10urlPolling10Foundation3URLVvp">urlPolling</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(py)urlPolling">urlPolling</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -800,7 +778,9 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">urlPolling</span><span class="p">:</span> <span class="kt">URL</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">urlPolling</span><span class="p">:</span> <span class="nf">URL</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -810,9 +790,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC06urlWebA010Foundation3URLVvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(py)urlWebSocket"></a>
                    <a name="//apple_ref/swift/Property/urlWebSocket" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC06urlWebA010Foundation3URLVvp">urlWebSocket</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(py)urlWebSocket">urlWebSocket</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -827,7 +807,9 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">urlWebSocket</span><span class="p">:</span> <span class="kt">URL</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">urlWebSocket</span><span class="p">:</span> <span class="nf">URL</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -837,36 +819,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC7versionAA0A9IOVersionOvp"></a>
-                    <a name="//apple_ref/swift/Property/version" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC7versionAA0A9IOVersionOvp">version</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        <p>The version of engine.io being used. Default is three.</p>
-
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">version</span><span class="p">:</span> <span class="kt"><a href="../Enums/SocketIOVersion.html">SocketIOVersion</a></span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:8SocketIO0A6EngineC9websocketSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(py)websocket"></a>
                    <a name="//apple_ref/swift/Property/websocket" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC9websocketSbvp">websocket</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(py)websocket">websocket</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -881,8 +836,10 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">@available</span><span class="p">(</span><span class="o">*</span><span class="p">,</span> <span class="n">deprecated</span><span class="p">,</span> <span class="nv">message</span><span class="p">:</span> <span class="s">"No longer needed, if we're not polling, then we must be doing websockets"</span><span class="p">)</span>
-<span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">websocket</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">@available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets")</span>
+<span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">websocket</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -909,7 +866,9 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">enableSOCKSProxy</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">enableSOCKSProxy</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -919,9 +878,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC2ws10Starscream03WebA0CSgvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(py)ws"></a>
                    <a name="//apple_ref/swift/Property/ws" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC2ws10Starscream03WebA0CSgvp">ws</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(py)ws">ws</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -936,7 +895,9 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">ws</span><span class="p">:</span> <span class="kt">WebSocket</span><span class="p">?</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">ws</span><span class="p">:</span> <span class="nf">WebSocket</span><span class="p">?</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -946,36 +907,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC11wsConnectedSbvp"></a>
-                    <a name="//apple_ref/swift/Property/wsConnected" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC11wsConnectedSbvp">wsConnected</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        <p>Whether or not the WebSocket is currently connected.</p>
-
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">wsConnected</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:8SocketIO0A6EngineC6clientAA0aC6Client_pSgvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(py)client"></a>
                    <a name="//apple_ref/swift/Property/client" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC6clientAA0aC6Client_pSgvp">client</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(py)client">client</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1003,11 +937,9 @@ disconnect us.</p>
              <div class="task-name-container">
                <a name="/Initializers"></a>
                <a name="//apple_ref/swift/Section/Initializers" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Initializers"></a>
-                  <h3 class="section-name"><p>Initializers</p>
-</h3>
-                </div>
+                <a href="#/Initializers">
+                  <h3 class="section-name">Initializers</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -1015,7 +947,7 @@ disconnect us.</p>
                    <code>
                    <a name="/s:8SocketIO0A6EngineC6client3url6configAcA0aC6Client_p_10Foundation3URLVAA0A21IOClientConfigurationVtcfc"></a>
                    <a name="//apple_ref/swift/Method/init(client:url:config:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC6client3url6configAcA0aC6Client_p_10Foundation3URLVAA0A21IOClientConfigurationVtcfc">init(client:<wbr>url:<wbr>config:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A6EngineC6client3url6configAcA0aC6Client_p_10Foundation3URLVAA0A21IOClientConfigurationVtcfc">init(client:url:config:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1083,9 +1015,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC6client3url7optionsAcA0aC6Client_p_10Foundation3URLVSDySSypGSgtcfc"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(im)initWithClient:url:options:"></a>
                    <a name="//apple_ref/swift/Method/init(client:url:options:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC6client3url7optionsAcA0aC6Client_p_10Foundation3URLVSDySSypGSgtcfc">init(client:<wbr>url:<wbr>options:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(im)initWithClient:url:options:">init(client:url:options:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1100,7 +1032,7 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">required</span> <span class="kd">convenience</span> <span class="nf">init</span><span class="p">(</span><span class="nv">client</span><span class="p">:</span> <span class="kt"><a href="../Protocols/SocketEngineClient.html">SocketEngineClient</a></span><span class="p">,</span> <span class="nv">url</span><span class="p">:</span> <span class="kt">URL</span><span class="p">,</span> <span class="nv">options</span><span class="p">:</span> <span class="p">[</span><span class="kt">String</span> <span class="p">:</span> <span class="kt">Any</span><span class="p">]?)</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">required</span> <span class="n">convenience</span> <span class="nf">init</span><span class="p">(</span><span class="nv">client</span><span class="p">:</span> <span class="kt"><a href="../Protocols/SocketEngineClient.html">SocketEngineClient</a></span><span class="p">,</span> <span class="nv">url</span><span class="p">:</span> <span class="kt">URL</span><span class="p">,</span> <span class="nv">options</span><span class="p">:</span> <span class="p">[</span><span class="kt">String</span> <span class="p">:</span> <span class="kt">Any</span><span class="p">]?)</span></code></pre>

                        </div>
                      </div>
@ -1156,19 +1088,17 @@ disconnect us.</p>
              <div class="task-name-container">
                <a name="/Methods"></a>
                <a name="//apple_ref/swift/Section/Methods" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Methods"></a>
-                  <h3 class="section-name"><p>Methods</p>
-</h3>
-                </div>
+                <a href="#/Methods">
+                  <h3 class="section-name">Methods</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC7connectyyF"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(im)connect"></a>
                    <a name="//apple_ref/swift/Method/connect()" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC7connectyyF">connect()</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(im)connect">connect()</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1193,9 +1123,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC8didError6reasonySS_tF"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(im)didErrorWithReason:"></a>
                    <a name="//apple_ref/swift/Method/didError(reason:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC8didError6reasonySS_tF">didError(reason:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(im)didErrorWithReason:">didError(reason:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1220,9 +1150,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC10disconnect6reasonySS_tF"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(im)disconnectWithReason:"></a>
                    <a name="//apple_ref/swift/Method/disconnect(reason:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC10disconnect6reasonySS_tF">disconnect(reason:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(im)disconnectWithReason:">disconnect(reason:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1266,9 +1196,9 @@ disconnect us.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC13doFastUpgradeyyF"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(im)doFastUpgrade"></a>
                    <a name="//apple_ref/swift/Method/doFastUpgrade()" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC13doFastUpgradeyyF">doFastUpgrade()</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(im)doFastUpgrade">doFastUpgrade()</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1296,9 +1226,9 @@ WebSocket mode.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC024flushWaitingForPostToWebA0yyF"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(im)flushWaitingForPostToWebSocket"></a>
                    <a name="//apple_ref/swift/Method/flushWaitingForPostToWebSocket()" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC024flushWaitingForPostToWebA0yyF">flushWaitingForPostToWebSocket()</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(im)flushWaitingForPostToWebSocket">flushWaitingForPostToWebSocket()</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1326,9 +1256,9 @@ the engine is attempting to upgrade to WebSocket it does not do any POSTing.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC05parseC4Datayy10Foundation0E0VF"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(im)parseEngineData:"></a>
                    <a name="//apple_ref/swift/Method/parseEngineData(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC05parseC4Datayy10Foundation0E0VF">parseEngineData(_:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(im)parseEngineData:">parseEngineData(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1372,9 +1302,9 @@ the engine is attempting to upgrade to WebSocket it does not do any POSTing.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC05parseC7MessageyySSF"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(im)parseEngineMessage:"></a>
                    <a name="//apple_ref/swift/Method/parseEngineMessage(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC05parseC7MessageyySSF">parseEngineMessage(_:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(im)parseEngineMessage:">parseEngineMessage(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1420,7 +1350,7 @@ the engine is attempting to upgrade to WebSocket it does not do any POSTing.</p>
                    <code>
                    <a name="/s:8SocketIO0A6EngineC10setConfigsyyAA0A21IOClientConfigurationVF"></a>
                    <a name="//apple_ref/swift/Method/setConfigs(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC10setConfigsyyAA0A21IOClientConfigurationVF">setConfigs(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A6EngineC10setConfigsyyAA0A21IOClientConfigurationVF">setConfigs(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1447,9 +1377,9 @@ the engine is attempting to upgrade to WebSocket it does not do any POSTing.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A6EngineC5write_8withType0E4Data10completionySS_AA0ac6PacketF0OSay10Foundation0G0VGyycSgtF"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketEngine(im)write:withType:withData:completion:"></a>
                    <a name="//apple_ref/swift/Method/write(_:withType:withData:completion:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC5write_8withType0E4Data10completionySS_AA0ac6PacketF0OSay10Foundation0G0VGyycSgtF">write(_:<wbr>withType:<wbr>withData:<wbr>completion:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketEngine(im)write:withType:withData:completion:">write(_:withType:withData:completion:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1532,11 +1462,9 @@ the engine is attempting to upgrade to WebSocket it does not do any POSTing.</p>
              <div class="task-name-container">
                <a name="/URLSessionDelegate%20methods"></a>
                <a name="//apple_ref/swift/Section/URLSessionDelegate methods" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/URLSessionDelegate%20methods"></a>
-                  <h3 class="section-name"><p>URLSessionDelegate methods</p>
-</h3>
-                </div>
+                <a href="#/URLSessionDelegate%20methods">
+                  <h3 class="section-name">URLSessionDelegate methods</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -1544,7 +1472,7 @@ the engine is attempting to upgrade to WebSocket it does not do any POSTing.</p>
                    <code>
                    <a name="/s:8SocketIO0A6EngineC10URLSession7session25didBecomeInvalidWithErrorySo12NSURLSessionC_So7NSErrorCSgtF"></a>
                    <a name="//apple_ref/swift/Method/URLSession(session:didBecomeInvalidWithError:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC10URLSession7session25didBecomeInvalidWithErrorySo12NSURLSessionC_So7NSErrorCSgtF">URLSession(session:<wbr>didBecomeInvalidWithError:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A6EngineC10URLSession7session25didBecomeInvalidWithErrorySo12NSURLSessionC_So7NSErrorCSgtF">URLSession(session:didBecomeInvalidWithError:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1559,71 +1487,13 @@ the engine is attempting to upgrade to WebSocket it does not do any POSTing.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">func</span> <span class="kt">URLSession</span><span class="p">(</span><span class="nv">session</span><span class="p">:</span> <span class="kt">URLSession</span><span class="p">,</span> <span class="n">didBecomeInvalidWithError</span> <span class="nv">error</span><span class="p">:</span> <span class="kt">NSError</span><span class="p">?)</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">func</span> <span class="nf">URLSession</span><span class="p">(</span><span class="nv">session</span><span class="p">:</span> <span class="kt">URLSession</span><span class="p">,</span> <span class="n">didBecomeInvalidWithError</span> <span class="nv">error</span><span class="p">:</span> <span class="kt">NSError</span><span class="p">?)</span></code></pre>

                        </div>
                      </div>
                    </section>
                  </div>
                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:8SocketIO0A6EngineC10didReceive5event6clienty10Starscream03WebA5EventO_AG0iA0CtF"></a>
-                    <a name="//apple_ref/swift/Method/didReceive(event:client:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6EngineC10didReceive5event6clienty10Starscream03WebA5EventO_AG0iA0CtF">didReceive(event:<wbr>client:<wbr>)</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        <p>Delegate method for WebSocketDelegate.</p>
-
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">func</span> <span class="nf">didReceive</span><span class="p">(</span><span class="nv">event</span><span class="p">:</span> <span class="kt">WebSocketEvent</span><span class="p">,</span> <span class="n"><a href="../Classes/SocketEngine.html#/s:8SocketIO0A6EngineC6clientAA0aC6Client_pSgvp">client</a></span> <span class="nv">_</span><span class="p">:</span> <span class="kt">WebSocket</span><span class="p">)</span></code></pre>
-
-                        </div>
-                      </div>
-                      <div>
-                        <h4>Parameters</h4>
-                        <table class="graybox">
-                          <tbody>
-                            <tr>
-                              <td>
-                                <code>
-                                <em>event</em>
-                                </code>
-                              </td>
-                              <td>
-                                <div>
-                                  <p>WS Event</p>
-                                </div>
-                              </td>
-                            </tr>
-                            <tr>
-                              <td>
-                                <code>
-                                <em>_</em>
-                                </code>
-                              </td>
-                              <td>
-                                <div>
-                                  <p></p>
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                      </div>
-                    </section>
-                  </div>
-                </li>
              </ul>
            </div>
          </div>
@ -1632,8 +1502,8 @@ the engine is attempting to upgrade to WebSocket it does not do any POSTing.</p>
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Classes/SocketIOClient.html
+++ b/docs/Classes/SocketIOClient.html
--- a/docs/Classes/SocketManager.html
+++ b/docs/Classes/SocketManager.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketManager</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">open</span> <span class="kd">class</span> <span class="kt">SocketManager</span> <span class="p">:</span> <span class="kt">NSObject</span><span class="p">,</span> <span class="kt"><a href="../Protocols/SocketManagerSpec.html">SocketManagerSpec</a></span><span class="p">,</span> <span class="kt"><a href="../Protocols/SocketParsable.html">SocketParsable</a></span><span class="p">,</span> <span class="kt"><a href="../Protocols/SocketDataBufferable.html">SocketDataBufferable</a></span><span class="p">,</span> <span class="kt"><a href="../Protocols/ConfigSettable.html">ConfigSettable</a></span></code></pre>

                </div>
@ -242,7 +197,7 @@
 <p>A <code>SocketManager</code> is responsible for multiplexing multiple namespaces through a single <code><a href="../Protocols/SocketEngineSpec.html">SocketEngineSpec</a></code>.</p>

 <p>Example:</p>
-<pre class="highlight swift"><code><span class="k">let</span> <span class="nv">manager</span> <span class="o">=</span> <span class="kt">SocketManager</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="kt">URL</span><span class="p">(</span><span class="nv">string</span><span class="p">:</span><span class="s">"http://localhost:8080/"</span><span class="p">)</span><span class="o">!</span><span class="p">)</span>
+<pre class="highlight swift"><code><span class="k">let</span> <span class="nv">manager</span> <span class="o">=</span> <span class="nf">SocketManager</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="nf">URL</span><span class="p">(</span><span class="nv">string</span><span class="p">:</span><span class="s">"http://localhost:8080/"</span><span class="p">)</span><span class="o">!</span><span class="p">)</span>
 <span class="k">let</span> <span class="nv">defaultNamespaceSocket</span> <span class="o">=</span> <span class="n">manager</span><span class="o">.</span><span class="n">defaultSocket</span>
 <span class="k">let</span> <span class="nv">swiftSocket</span> <span class="o">=</span> <span class="n">manager</span><span class="o">.</span><span class="nf">socket</span><span class="p">(</span><span class="nv">forNamespace</span><span class="p">:</span> <span class="s">"/swift"</span><span class="p">)</span>

@ -252,7 +207,7 @@
 <p>Sockets created through the manager are retained by the manager. So at the very least, a single strong reference
 to the manager must be maintained to keep sockets alive.</p>

-<p>To disconnect a socket and remove it from the manager, either call <code><a href="../Classes/SocketIOClient.html#/s:8SocketIO0A8IOClientC10disconnectyyF">SocketIOClient.disconnect()</a></code> on the socket,
+<p>To disconnect a socket and remove it from the manager, either call <code><a href="../Classes/SocketIOClient.html#/c:@M@SocketIO@objc(cs)SocketIOClient(im)disconnect">SocketIOClient.disconnect()</a></code> on the socket,
 or call one of the <code>disconnectSocket</code> methods on this class.</p>

 <p><strong>NOTE</strong>: The manager is not thread/queue safe, all interaction with the manager should be done on the <code>handleQueue</code></p>
@ -266,19 +221,17 @@ or call one of the <code>disconnectSocket</code> methods on this class.</p>
              <div class="task-name-container">
                <a name="/Properties"></a>
                <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
-</h3>
-                </div>
+                <a href="#/Properties">
+                  <h3 class="section-name">Properties</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC07defaultA0AA0A8IOClientCvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(py)defaultSocket"></a>
                    <a name="//apple_ref/swift/Property/defaultSocket" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC07defaultA0AA0A8IOClientCvp">defaultSocket</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(py)defaultSocket">defaultSocket</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -286,14 +239,14 @@ or call one of the <code>disconnectSocket</code> methods on this class.</p>
                    <section class="section">
                      <div class="pointer"></div>
                      <div class="abstract">
-                        <p>The socket associated with the default namespace (&ldquo;/&rdquo;).</p>
+                        <p>The socket associated with the default namespace (<q>/</q>).</p>

                      </div>
                      <div class="declaration">
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">defaultSocket</span><span class="p">:</span> <span class="kt"><a href="../Classes/SocketIOClient.html">SocketIOClient</a></span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">defaultSocket</span><span class="p">:</span> <span class="nf">SocketIOClient</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -303,9 +256,9 @@ or call one of the <code>disconnectSocket</code> methods on this class.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC9socketURL10Foundation0E0Vvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(py)socketURL"></a>
                    <a name="//apple_ref/swift/Property/socketURL" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC9socketURL10Foundation0E0Vvp">socketURL</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(py)socketURL">socketURL</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -315,7 +268,7 @@ or call one of the <code>disconnectSocket</code> methods on this class.</p>
                      <div class="abstract">
                        <p>The URL of the socket.io server.</p>

-<p>If changed after calling <code>init</code>, <code><a href="../Classes/SocketManager.html#/s:8SocketIO0A7ManagerC8forceNewSbvp">forceNew</a></code> must be set to <code>true</code>, or it will only connect to the url set in the
+<p>If changed after calling <code>init</code>, <code><a href="../Classes/SocketManager.html#/c:@M@SocketIO@objc(cs)SocketManager(py)forceNew">forceNew</a></code> must be set to <code>true</code>, or it will only connect to the url set in the
 init.</p>

                      </div>
@ -352,7 +305,7 @@ init.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">config</span><span class="p">:</span> <span class="kt"><a href="../Structs/SocketIOClientConfiguration.html">SocketIOClientConfiguration</a></span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">config</span><span class="p">:</span> <span class="nf">SocketIOClientConfiguration</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -362,9 +315,9 @@ init.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC6engineAA0A10EngineSpec_pSgvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(py)engine"></a>
                    <a name="//apple_ref/swift/Property/engine" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC6engineAA0A10EngineSpec_pSgvp">engine</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(py)engine">engine</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -389,9 +342,9 @@ init.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC8forceNewSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(py)forceNew"></a>
                    <a name="//apple_ref/swift/Property/forceNew" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC8forceNewSbvp">forceNew</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(py)forceNew">forceNew</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -416,9 +369,9 @@ init.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC11handleQueueSo17OS_dispatch_queueCvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(py)handleQueue"></a>
                    <a name="//apple_ref/swift/Property/handleQueue" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC11handleQueueSo17OS_dispatch_queueCvp">handleQueue</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(py)handleQueue">handleQueue</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -446,9 +399,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC4nspsSDySSAA0A8IOClientCGvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(py)nsps"></a>
                    <a name="//apple_ref/swift/Property/nsps" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC4nspsSDySSAA0A8IOClientCGvp">nsps</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(py)nsps">nsps</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -473,9 +426,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC10reconnectsSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(py)reconnects"></a>
                    <a name="//apple_ref/swift/Property/reconnects" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC10reconnectsSbvp">reconnects</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(py)reconnects">reconnects</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -500,9 +453,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC13reconnectWaitSivp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(py)reconnectWait"></a>
                    <a name="//apple_ref/swift/Property/reconnectWait" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC13reconnectWaitSivp">reconnectWait</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(py)reconnectWait">reconnectWait</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -527,9 +480,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC16reconnectWaitMaxSivp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(py)reconnectWaitMax"></a>
                    <a name="//apple_ref/swift/Property/reconnectWaitMax" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC16reconnectWaitMaxSivp">reconnectWaitMax</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(py)reconnectWaitMax">reconnectWaitMax</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -554,9 +507,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC19randomizationFactorSdvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(py)randomizationFactor"></a>
                    <a name="//apple_ref/swift/Property/randomizationFactor" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC19randomizationFactorSdvp">randomizationFactor</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(py)randomizationFactor">randomizationFactor</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -581,9 +534,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC6statusAA0A8IOStatusOvp"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(py)status"></a>
                    <a name="//apple_ref/swift/Property/status" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC6statusAA0A8IOStatusOvp">status</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(py)status">status</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -598,33 +551,7 @@ called on.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">status</span><span class="p">:</span> <span class="kt"><a href="../Enums/SocketIOStatus.html">SocketIOStatus</a></span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP7versionAA0A9IOVersionOvp"></a>
-                    <a name="//apple_ref/swift/Property/version" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP7versionAA0A9IOVersionOvp">version</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">version</span><span class="p">:</span> <span class="kt"><a href="../Enums/SocketIOVersion.html">SocketIOVersion</a></span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">private(set)</span> <span class="k">var</span> <span class="nv">status</span><span class="p">:</span> <span class="nf">SocketIOStatus</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -669,11 +596,9 @@ So this should ideally be an array of one packet waiting for data.</p>
              <div class="task-name-container">
                <a name="/Initializers"></a>
                <a name="//apple_ref/swift/Section/Initializers" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Initializers"></a>
-                  <h3 class="section-name"><p>Initializers</p>
-</h3>
-                </div>
+                <a href="#/Initializers">
+                  <h3 class="section-name">Initializers</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -681,7 +606,7 @@ So this should ideally be an array of one packet waiting for data.</p>
                    <code>
                    <a name="/s:8SocketIO0A7ManagerC9socketURL6configAC10Foundation0E0V_AA0A21IOClientConfigurationVtcfc"></a>
                    <a name="//apple_ref/swift/Method/init(socketURL:config:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC9socketURL6configAC10Foundation0E0V_AA0A21IOClientConfigurationVtcfc">init(socketURL:<wbr>config:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A7ManagerC9socketURL6configAC10Foundation0E0V_AA0A21IOClientConfigurationVtcfc">init(socketURL:config:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -739,7 +664,7 @@ So this should ideally be an array of one packet waiting for data.</p>
                    <code>
                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)initWithSocketURL:config:"></a>
                    <a name="//apple_ref/swift/Method/init(socketURL:config:)" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)initWithSocketURL:config:">init(socketURL:<wbr>config:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)initWithSocketURL:config:">init(socketURL:config:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -756,7 +681,7 @@ If using Swift it&rsquo;s recommended to use <code>init(socketURL: NSURL, option
                        <div class="language">
                          <p class="aside-title">Swift</p>
                          <pre class="highlight swift"><code><span class="kd">@objc</span>
-<span class="kd">public</span> <span class="kd">convenience</span> <span class="nf">init</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="kt">URL</span><span class="p">,</span> <span class="nv">config</span><span class="p">:</span> <span class="p">[</span><span class="kt">String</span> <span class="p">:</span> <span class="kt">Any</span><span class="p">]?)</span></code></pre>
+<span class="kd">public</span> <span class="n">convenience</span> <span class="nf">init</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="kt">URL</span><span class="p">,</span> <span class="nv">config</span><span class="p">:</span> <span class="p">[</span><span class="kt">String</span> <span class="p">:</span> <span class="kt">Any</span><span class="p">]?)</span></code></pre>

                        </div>
                      </div>
@ -800,19 +725,17 @@ If using Swift it&rsquo;s recommended to use <code>init(socketURL: NSURL, option
              <div class="task-name-container">
                <a name="/Methods"></a>
                <a name="//apple_ref/swift/Section/Methods" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Methods"></a>
-                  <h3 class="section-name"><p>Methods</p>
-</h3>
-                </div>
+                <a href="#/Methods">
+                  <h3 class="section-name">Methods</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC7connectyyF"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)connect"></a>
                    <a name="//apple_ref/swift/Method/connect()" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC7connectyyF">connect()</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)connect">connect()</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -839,9 +762,9 @@ If using Swift it&rsquo;s recommended to use <code>init(socketURL: NSURL, option
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC07connectA0_11withPayloadyAA0A8IOClientC_SDySSypGSgtF"></a>
-                    <a name="//apple_ref/swift/Method/connectSocket(_:withPayload:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC07connectA0_11withPayloadyAA0A8IOClientC_SDySSypGSgtF">connectSocket(_:<wbr>withPayload:<wbr>)</a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)connectSocket:"></a>
+                    <a name="//apple_ref/swift/Method/connectSocket(_:)" class="dashAnchor"></a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)connectSocket:">connectSocket(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -856,7 +779,7 @@ If using Swift it&rsquo;s recommended to use <code>init(socketURL: NSURL, option
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">open</span> <span class="kd">func</span> <span class="nf">connectSocket</span><span class="p">(</span><span class="n">_</span> <span class="nv">socket</span><span class="p">:</span> <span class="kt"><a href="../Classes/SocketIOClient.html">SocketIOClient</a></span><span class="p">,</span> <span class="n">withPayload</span> <span class="nv">payload</span><span class="p">:</span> <span class="p">[</span><span class="kt">String</span> <span class="p">:</span> <span class="kt">Any</span><span class="p">]?</span> <span class="o">=</span> <span class="kc">nil</span><span class="p">)</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">open</span> <span class="kd">func</span> <span class="nf">connectSocket</span><span class="p">(</span><span class="n">_</span> <span class="nv">socket</span><span class="p">:</span> <span class="kt"><a href="../Classes/SocketIOClient.html">SocketIOClient</a></span><span class="p">)</span></code></pre>

                        </div>
                      </div>
@ -876,18 +799,6 @@ If using Swift it&rsquo;s recommended to use <code>init(socketURL: NSURL, option
                                </div>
                              </td>
                            </tr>
-                            <tr>
-                              <td>
-                                <code>
-                                <em>withPayload</em>
-                                </code>
-                              </td>
-                              <td>
-                                <div>
-                                  <p>Optional payload to send on connect</p>
-                                </div>
-                              </td>
-                            </tr>
                          </tbody>
                        </table>
                      </div>
@ -897,9 +808,9 @@ If using Swift it&rsquo;s recommended to use <code>init(socketURL: NSURL, option
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC13didDisconnect6reasonySS_tF"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)didDisconnectWithReason:"></a>
                    <a name="//apple_ref/swift/Method/didDisconnect(reason:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC13didDisconnect6reasonySS_tF">didDisconnect(reason:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)didDisconnectWithReason:">didDisconnect(reason:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -943,9 +854,9 @@ If using Swift it&rsquo;s recommended to use <code>init(socketURL: NSURL, option
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC10disconnectyyF"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)disconnect"></a>
                    <a name="//apple_ref/swift/Method/disconnect()" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC10disconnectyyF">disconnect()</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)disconnect">disconnect()</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -970,9 +881,9 @@ If using Swift it&rsquo;s recommended to use <code>init(socketURL: NSURL, option
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC010disconnectA0yyAA0A8IOClientCF"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)disconnectSocket:"></a>
                    <a name="//apple_ref/swift/Method/disconnectSocket(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC010disconnectA0yyAA0A8IOClientCF">disconnectSocket(_:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)disconnectSocket:">disconnectSocket(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1019,9 +930,9 @@ releasing.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC010disconnectA012forNamespaceySS_tF"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)disconnectSocketForNamespace:"></a>
                    <a name="//apple_ref/swift/Method/disconnectSocket(forNamespace:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC010disconnectA012forNamespaceySS_tF">disconnectSocket(forNamespace:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)disconnectSocketForNamespace:">disconnectSocket(forNamespace:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1070,7 +981,7 @@ releasing.</p>
                    <code>
                    <a name="/s:8SocketIO0A7ManagerC7emitAll11clientEvent4datayAA0a6ClientG0O_SayypGtF"></a>
                    <a name="//apple_ref/swift/Method/emitAll(clientEvent:data:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC7emitAll11clientEvent4datayAA0a6ClientG0O_SayypGtF">emitAll(clientEvent:<wbr>data:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A7ManagerC7emitAll11clientEvent4datayAA0a6ClientG0O_SayypGtF">emitAll(clientEvent:data:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1078,7 +989,7 @@ releasing.</p>
                    <section class="section">
                      <div class="pointer"></div>
                      <div class="abstract">
-                        <p>Sends a client event to all sockets in <code><a href="../Classes/SocketManager.html#/s:8SocketIO0A7ManagerC4nspsSDySSAA0A8IOClientCGvp">nsps</a></code></p>
+                        <p>Sends a client event to all sockets in <code><a href="../Classes/SocketManager.html#/c:@M@SocketIO@objc(cs)SocketManager(py)nsps">nsps</a></code></p>

                      </div>
                      <div class="declaration">
@ -1116,7 +1027,7 @@ releasing.</p>
                    <code>
                    <a name="/s:8SocketIO0A7ManagerC7emitAllyySS_AA0A4Data_pdtF"></a>
                    <a name="//apple_ref/swift/Method/emitAll(_:_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC7emitAllyySS_AA0A4Data_pdtF">emitAll(_:<wbr>_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A7ManagerC7emitAllyySS_AA0A4Data_pdtF">emitAll(_:_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1169,12 +1080,72 @@ releasing.</p>
                    </section>
                  </div>
                </li>
+                <li class="item">
+                  <div>
+                    <code>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)emitAll:withItems:"></a>
+                    <a name="//apple_ref/swift/Method/emitAll(_:withItems:)" class="dashAnchor"></a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)emitAll:withItems:">emitAll(_:withItems:)</a>
+                    </code>
+                  </div>
+                  <div class="height-container">
+                    <div class="pointer-container"></div>
+                    <section class="section">
+                      <div class="pointer"></div>
+                      <div class="abstract">
+                        <p>Sends an event to the server on all namespaces in this manager.</p>
+
+<p>Same as <code><a href="../Classes/SocketManager.html#/s:8SocketIO0A7ManagerC7emitAllyySS_AA0A4Data_pdtF">emitAll(_:_:)</a></code>, but meant for Objective-C.</p>
+
+                      </div>
+                      <div class="declaration">
+                        <h4>Declaration</h4>
+                        <div class="language">
+                          <p class="aside-title">Swift</p>
+                          <pre class="highlight swift"><code><span class="kd">open</span> <span class="kd">func</span> <span class="nf">emitAll</span><span class="p">(</span><span class="n">_</span> <span class="nv">event</span><span class="p">:</span> <span class="kt">String</span><span class="p">,</span> <span class="n">withItems</span> <span class="nv">items</span><span class="p">:</span> <span class="p">[</span><span class="kt">Any</span><span class="p">])</span></code></pre>
+
+                        </div>
+                      </div>
+                      <div>
+                        <h4>Parameters</h4>
+                        <table class="graybox">
+                          <tbody>
+                            <tr>
+                              <td>
+                                <code>
+                                <em>event</em>
+                                </code>
+                              </td>
+                              <td>
+                                <div>
+                                  <p>The event to send.</p>
+                                </div>
+                              </td>
+                            </tr>
+                            <tr>
+                              <td>
+                                <code>
+                                <em>items</em>
+                                </code>
+                              </td>
+                              <td>
+                                <div>
+                                  <p>The data to send with this event.</p>
+                                </div>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </div>
+                    </section>
+                  </div>
+                </li>
                <li class="item">
                  <div>
                    <code>
                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidCloseWithReason:"></a>
                    <a name="//apple_ref/swift/Method/engineDidClose(reason:)" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidCloseWithReason:">engineDidClose(reason:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidCloseWithReason:">engineDidClose(reason:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1220,7 +1191,7 @@ releasing.</p>
                    <code>
                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidErrorWithReason:"></a>
                    <a name="//apple_ref/swift/Method/engineDidError(reason:)" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidErrorWithReason:">engineDidError(reason:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidErrorWithReason:">engineDidError(reason:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1266,7 +1237,7 @@ releasing.</p>
                    <code>
                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidOpenWithReason:"></a>
                    <a name="//apple_ref/swift/Method/engineDidOpen(reason:)" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidOpenWithReason:">engineDidOpen(reason:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidOpenWithReason:">engineDidOpen(reason:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1310,9 +1281,9 @@ releasing.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidReceivePing"></a>
-                    <a name="//apple_ref/swift/Method/engineDidReceivePing()" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidReceivePing">engineDidReceivePing()</a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidReceivePong"></a>
+                    <a name="//apple_ref/swift/Method/engineDidReceivePong()" class="dashAnchor"></a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidReceivePong">engineDidReceivePong()</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1320,14 +1291,14 @@ releasing.</p>
                    <section class="section">
                      <div class="pointer"></div>
                      <div class="abstract">
-                        <p>Called when the engine receives a ping message.</p>
+                        <p>Called when the engine receives a pong message.</p>

                      </div>
                      <div class="declaration">
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">open</span> <span class="kd">func</span> <span class="nf">engineDidReceivePing</span><span class="p">()</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">open</span> <span class="kd">func</span> <span class="nf">engineDidReceivePong</span><span class="p">()</span></code></pre>

                        </div>
                      </div>
@ -1361,66 +1332,12 @@ releasing.</p>
                    </section>
                  </div>
                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidReceivePong"></a>
-                    <a name="//apple_ref/swift/Method/engineDidReceivePong()" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidReceivePong">engineDidReceivePong()</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        <p>Called when the engine receives a pong message.</p>
-
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">open</span> <span class="kd">func</span> <span class="nf">engineDidReceivePong</span><span class="p">()</span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidSendPong"></a>
-                    <a name="//apple_ref/swift/Method/engineDidSendPong()" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidSendPong">engineDidSendPong()</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        <p>Called when the sends a pong to the server.</p>
-
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">open</span> <span class="kd">func</span> <span class="nf">engineDidSendPong</span><span class="p">()</span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
                <li class="item">
                  <div>
                    <code>
                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidWebsocketUpgradeWithHeaders:"></a>
                    <a name="//apple_ref/swift/Method/engineDidWebsocketUpgrade(headers:)" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidWebsocketUpgradeWithHeaders:">engineDidWebsocketUpgrade(headers:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)engineDidWebsocketUpgradeWithHeaders:">engineDidWebsocketUpgrade(headers:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1466,7 +1383,7 @@ releasing.</p>
                    <code>
                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)parseEngineMessage:"></a>
                    <a name="//apple_ref/swift/Method/parseEngineMessage(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)parseEngineMessage:">parseEngineMessage(_:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)parseEngineMessage:">parseEngineMessage(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1512,7 +1429,7 @@ releasing.</p>
                    <code>
                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)parseEngineBinaryData:"></a>
                    <a name="//apple_ref/swift/Method/parseEngineBinaryData(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)parseEngineBinaryData:">parseEngineBinaryData(_:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)parseEngineBinaryData:">parseEngineBinaryData(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1556,9 +1473,9 @@ releasing.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC9reconnectyyF"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)reconnect"></a>
                    <a name="//apple_ref/swift/Method/reconnect()" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC9reconnectyyF">reconnect()</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)reconnect">reconnect()</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1586,9 +1503,9 @@ releasing.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC06removeA0yAA0A8IOClientCSgAFF"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)removeSocket:"></a>
                    <a name="//apple_ref/swift/Method/removeSocket(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC06removeA0yAA0A8IOClientCSgAFF">removeSocket(_:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)removeSocket:">removeSocket(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1642,7 +1559,7 @@ method.</p>
                    <code>
                    <a name="/s:8SocketIO0A7ManagerC10setConfigsyyAA0A21IOClientConfigurationVF"></a>
                    <a name="//apple_ref/swift/Method/setConfigs(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC10setConfigsyyAA0A21IOClientConfigurationVF">setConfigs(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A7ManagerC10setConfigsyyAA0A21IOClientConfigurationVF">setConfigs(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1669,9 +1586,9 @@ method.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A7ManagerC6socket12forNamespaceAA0A8IOClientCSS_tF"></a>
+                    <a name="/c:@M@SocketIO@objc(cs)SocketManager(im)socketForNamespace:"></a>
                    <a name="//apple_ref/swift/Method/socket(forNamespace:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7ManagerC6socket12forNamespaceAA0A8IOClientCSS_tF">socket(forNamespace:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketManager(im)socketForNamespace:">socket(forNamespace:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1685,7 +1602,7 @@ method.</p>

 <p>Sockets created from this method are retained by the manager.
 Call one of the <code>disconnectSocket</code> methods on this class to remove the socket from manager control.
-Or call <code><a href="../Classes/SocketIOClient.html#/s:8SocketIO0A8IOClientC10disconnectyyF">SocketIOClient.disconnect()</a></code> on the client.</p>
+Or call <code><a href="../Classes/SocketIOClient.html#/c:@M@SocketIO@objc(cs)SocketIOClient(im)disconnect">SocketIOClient.disconnect()</a></code> on the client.</p>

                      </div>
                      <div class="declaration">
@ -1730,8 +1647,8 @@ Or call <code><a href="../Classes/SocketIOClient.html#/s:8SocketIO0A8IOClientC10
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Classes/SocketRawAckView.html
+++ b/docs/Classes/SocketRawAckView.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketRawAckView</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">final</span> <span class="kd">class</span> <span class="kt">SocketRawAckView</span> <span class="p">:</span> <span class="kt">NSObject</span></code></pre>

                </div>
@ -255,7 +210,7 @@
                    <code>
                    <a name="/s:8SocketIO0A10RawAckViewC4withyyAA0A4Data_pd_tF"></a>
                    <a name="//apple_ref/swift/Method/with(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10RawAckViewC4withyyAA0A4Data_pd_tF">with(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A10RawAckViewC4withyyAA0A4Data_pd_tF">with(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -304,7 +259,7 @@ will be emitted. The structure of the error data is <code>[ackNum, items, theErr
                    <code>
                    <a name="/c:@M@SocketIO@objc(cs)SocketRawAckView(im)with:"></a>
                    <a name="//apple_ref/swift/Method/with(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketRawAckView(im)with:">with(_:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketRawAckView(im)with:">with(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -354,8 +309,8 @@ will be emitted. The structure of the error data is <code>[ackNum, items, theErr
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Classes/SocketRawView.html
+++ b/docs/Classes/SocketRawView.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketRawView</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">final</span> <span class="kd">class</span> <span class="kt">SocketRawView</span> <span class="p">:</span> <span class="kt">NSObject</span></code></pre>

                </div>
@ -255,7 +210,7 @@
                    <code>
                    <a name="/s:8SocketIO0A7RawViewC4emityySS_AA0A4Data_pdtF"></a>
                    <a name="//apple_ref/swift/Method/emit(_:_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7RawViewC4emityySS_AA0A4Data_pdtF">emit(_:<wbr>_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A7RawViewC4emityySS_AA0A4Data_pdtF">emit(_:_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -316,7 +271,7 @@ will be emitted. The structure of the error data is <code>[eventName, items, the
                    <code>
                    <a name="/c:@M@SocketIO@objc(cs)SocketRawView(im)emit:with:"></a>
                    <a name="//apple_ref/swift/Method/emit(_:with:)" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketRawView(im)emit:with:">emit(_:<wbr>with:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketRawView(im)emit:with:">emit(_:with:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -375,7 +330,7 @@ will be emitted. The structure of the error data is <code>[eventName, items, the
                    <code>
                    <a name="/s:8SocketIO0A7RawViewC11emitWithAckyAA02OnG8CallbackCSS_AA0A4Data_pdtF"></a>
                    <a name="//apple_ref/swift/Method/emitWithAck(_:_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A7RawViewC11emitWithAckyAA02OnG8CallbackCSS_AA0A4Data_pdtF">emitWithAck(_:<wbr>_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A7RawViewC11emitWithAckyAA02OnG8CallbackCSS_AA0A4Data_pdtF">emitWithAck(_:_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -449,7 +404,7 @@ will be emitted. The structure of the error data is <code>[eventName, items, the
                    <code>
                    <a name="/c:@M@SocketIO@objc(cs)SocketRawView(im)emitWithAck:with:"></a>
                    <a name="//apple_ref/swift/Method/emitWithAck(_:with:)" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketRawView(im)emitWithAck:with:">emitWithAck(_:<wbr>with:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(cs)SocketRawView(im)emitWithAck:with:">emitWithAck(_:with:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -524,8 +479,8 @@ Check that your server&rsquo;s api will ack the event being sent.</p>
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Enums.html
+++ b/docs/Enums.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,7 +184,7 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>Enumerations</h1>
            <p>The following enumerations are available globally.</p>

@ -267,34 +223,10 @@
                    </section>
                  </div>
                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:8SocketIO0A9IOVersionO"></a>
-                    <a name="//apple_ref/swift/Enum/SocketIOVersion" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A9IOVersionO">SocketIOVersion</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        <p>The socket.io version being used.</p>
-
-                        <a href="Enums/SocketIOVersion.html" class="slightly-smaller">See more</a>
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">enum</span> <span class="kt">SocketIOVersion</span> <span class="p">:</span> <span class="kt">Int</span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
@ -323,6 +255,10 @@
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
@ -351,6 +287,10 @@
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
@ -380,6 +320,10 @@
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
@ -409,6 +353,10 @@
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
@ -445,8 +393,8 @@
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Enums/SocketAckStatus.html
+++ b/docs/Enums/SocketAckStatus.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketAckStatus</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">enum</span> <span class="kt">SocketAckStatus</span> <span class="p">:</span> <span class="kt">String</span></code></pre>

                </div>
@ -248,11 +203,9 @@
              <div class="task-name-container">
                <a name="/Cases"></a>
                <a name="//apple_ref/swift/Section/Cases" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Cases"></a>
-                  <h3 class="section-name"><p>Cases</p>
-</h3>
-                </div>
+                <a href="#/Cases">
+                  <h3 class="section-name">Cases</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -282,60 +235,6 @@
                    </section>
                  </div>
                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:8SocketIO0A9AckStatusO2eeoiySbSS_ACtFZ"></a>
-                    <a name="//apple_ref/swift/Method/==(_:_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A9AckStatusO2eeoiySbSS_ACtFZ">==(_:<wbr>_:<wbr>)</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        <p>Tests whether a string is equal to a given SocketAckStatus</p>
-
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">static</span> <span class="kd">func</span> <span class="o">==</span> <span class="p">(</span><span class="nv">lhs</span><span class="p">:</span> <span class="kt">String</span><span class="p">,</span> <span class="nv">rhs</span><span class="p">:</span> <span class="kt">SocketAckStatus</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kt">Bool</span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:8SocketIO0A9AckStatusO2eeoiySbAC_SStFZ"></a>
-                    <a name="//apple_ref/swift/Method/==(_:_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A9AckStatusO2eeoiySbAC_SStFZ">==(_:<wbr>_:<wbr>)</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        <p>Tests whether a string is equal to a given SocketAckStatus</p>
-
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">static</span> <span class="kd">func</span> <span class="o">==</span> <span class="p">(</span><span class="nv">lhs</span><span class="p">:</span> <span class="kt">SocketAckStatus</span><span class="p">,</span> <span class="nv">rhs</span><span class="p">:</span> <span class="kt">String</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kt">Bool</span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
              </ul>
            </div>
          </div>
@ -344,8 +243,8 @@
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Enums/SocketClientEvent.html
+++ b/docs/Enums/SocketClientEvent.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketClientEvent</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">enum</span> <span class="kt">SocketClientEvent</span> <span class="p">:</span> <span class="kt">String</span></code></pre>

                </div>
@ -248,11 +203,9 @@
              <div class="task-name-container">
                <a name="/Cases"></a>
                <a name="//apple_ref/swift/Section/Cases" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Cases"></a>
-                  <h3 class="section-name"><p>Cases</p>
-</h3>
-                </div>
+                <a href="#/Cases">
+                  <h3 class="section-name">Cases</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -271,7 +224,7 @@
                        <p>Emitted when the client connects. This is also called on a successful reconnection. A connect event gets one
 data item: the namespace that was connected to.</p>
 <pre class="highlight swift"><code><span class="n">socket</span><span class="o">.</span><span class="nf">on</span><span class="p">(</span><span class="nv">clientEvent</span><span class="p">:</span> <span class="o">.</span><span class="n">connect</span><span class="p">)</span> <span class="p">{</span><span class="n">data</span><span class="p">,</span> <span class="n">ack</span> <span class="k">in</span>
-    <span class="k">guard</span> <span class="k">let</span> <span class="nv">nsp</span> <span class="o">=</span> <span class="n">data</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="k">as?</span> <span class="kt">String</span> <span class="k">else</span> <span class="p">{</span> <span class="k">return</span> <span class="p">}</span>
+    <span class="k">guard</span> <span class="k">let</span> <span class="nv">nsp</span> <span class="o">=</span> <span class="n">data</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="k">as?</span> <span class="kt">String</span> <span class="nf">else</span> <span class="p">{</span> <span class="k">return</span> <span class="p">}</span>
    <span class="c1">// Some logic using the nsp</span>
 <span class="p">}</span>
 </code></pre>
@ -564,8 +517,8 @@ if you are working in Objective-C.</p>
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Enums/SocketEnginePacketType.html
+++ b/docs/Enums/SocketEnginePacketType.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketEnginePacketType</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">@objc</span>
 <span class="kd">public</span> <span class="kd">enum</span> <span class="kt">SocketEnginePacketType</span> <span class="p">:</span> <span class="kt">Int</span></code></pre>

@ -444,8 +399,8 @@
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Enums/SocketIOClientOption.html
+++ b/docs/Enums/SocketIOClientOption.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketIOClientOption</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">enum</span> <span class="kt">SocketIOClientOption</span> <span class="p">:</span> <span class="kt">ClientOption</span></code></pre>

                </div>
@ -278,7 +233,7 @@
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO13connectParamsyACSDySSypGcACmF"></a>
                    <a name="//apple_ref/swift/Element/connectParams(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO13connectParamsyACSDySSypGcACmF">connectParams(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO13connectParamsyACSDySSypGcACmF">connectParams(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -305,7 +260,7 @@
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO7cookiesyACSaySo12NSHTTPCookieCGcACmF"></a>
                    <a name="//apple_ref/swift/Element/cookies(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO7cookiesyACSaySo12NSHTTPCookieCGcACmF">cookies(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO7cookiesyACSaySo12NSHTTPCookieCGcACmF">cookies(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -332,7 +287,7 @@
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO12extraHeadersyACSDyS2SGcACmF"></a>
                    <a name="//apple_ref/swift/Element/extraHeaders(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO12extraHeadersyACSDyS2SGcACmF">extraHeaders(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO12extraHeadersyACSDyS2SGcACmF">extraHeaders(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -359,7 +314,7 @@
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO8forceNewyACSbcACmF"></a>
                    <a name="//apple_ref/swift/Element/forceNew(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO8forceNewyACSbcACmF">forceNew(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO8forceNewyACSbcACmF">forceNew(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -387,7 +342,7 @@ or when you want to be sure no state from previous engines is being carried over
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO12forcePollingyACSbcACmF"></a>
                    <a name="//apple_ref/swift/Element/forcePolling(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO12forcePollingyACSbcACmF">forcePolling(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO12forcePollingyACSbcACmF">forcePolling(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -414,7 +369,7 @@ or when you want to be sure no state from previous engines is being carried over
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO15forceWebsocketsyACSbcACmF"></a>
                    <a name="//apple_ref/swift/Element/forceWebsockets(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO15forceWebsocketsyACSbcACmF">forceWebsockets(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO15forceWebsocketsyACSbcACmF">forceWebsockets(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -441,7 +396,7 @@ or when you want to be sure no state from previous engines is being carried over
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO16enableSOCKSProxyyACSbcACmF"></a>
                    <a name="//apple_ref/swift/Element/enableSOCKSProxy(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO16enableSOCKSProxyyACSbcACmF">enableSOCKSProxy(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO16enableSOCKSProxyyACSbcACmF">enableSOCKSProxy(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -468,7 +423,7 @@ or when you want to be sure no state from previous engines is being carried over
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO11handleQueueyACSo17OS_dispatch_queueCcACmF"></a>
                    <a name="//apple_ref/swift/Element/handleQueue(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO11handleQueueyACSo17OS_dispatch_queueCcACmF">handleQueue(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO11handleQueueyACSo17OS_dispatch_queueCcACmF">handleQueue(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -498,7 +453,7 @@ called on.</p>
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO3logyACSbcACmF"></a>
                    <a name="//apple_ref/swift/Element/log(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO3logyACSbcACmF">log(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO3logyACSbcACmF">log(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -525,7 +480,7 @@ called on.</p>
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO6loggeryAcA0A6Logger_pcACmF"></a>
                    <a name="//apple_ref/swift/Element/logger(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO6loggeryAcA0A6Logger_pcACmF">logger(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO6loggeryAcA0A6Logger_pcACmF">logger(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -552,7 +507,7 @@ called on.</p>
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO4pathyACSScACmF"></a>
                    <a name="//apple_ref/swift/Element/path(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO4pathyACSScACmF">path(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO4pathyACSScACmF">path(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -579,7 +534,7 @@ called on.</p>
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO10reconnectsyACSbcACmF"></a>
                    <a name="//apple_ref/swift/Element/reconnects(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO10reconnectsyACSbcACmF">reconnects(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO10reconnectsyACSbcACmF">reconnects(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -607,7 +562,7 @@ over when reconnects happen.</p>
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO17reconnectAttemptsyACSicACmF"></a>
                    <a name="//apple_ref/swift/Element/reconnectAttempts(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO17reconnectAttemptsyACSicACmF">reconnectAttempts(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO17reconnectAttemptsyACSicACmF">reconnectAttempts(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -634,7 +589,7 @@ over when reconnects happen.</p>
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO13reconnectWaityACSicACmF"></a>
                    <a name="//apple_ref/swift/Element/reconnectWait(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO13reconnectWaityACSicACmF">reconnectWait(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO13reconnectWaityACSicACmF">reconnectWait(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -661,7 +616,7 @@ over when reconnects happen.</p>
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO16reconnectWaitMaxyACSicACmF"></a>
                    <a name="//apple_ref/swift/Element/reconnectWaitMax(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO16reconnectWaitMaxyACSicACmF">reconnectWaitMax(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO16reconnectWaitMaxyACSicACmF">reconnectWaitMax(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -688,7 +643,7 @@ over when reconnects happen.</p>
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO19randomizationFactoryACSdcACmF"></a>
                    <a name="//apple_ref/swift/Element/randomizationFactor(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO19randomizationFactoryACSdcACmF">randomizationFactor(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO19randomizationFactoryACSdcACmF">randomizationFactor(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -715,7 +670,7 @@ over when reconnects happen.</p>
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO6secureyACSbcACmF"></a>
                    <a name="//apple_ref/swift/Element/secure(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO6secureyACSbcACmF">secure(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO6secureyACSbcACmF">secure(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -740,9 +695,9 @@ over when reconnects happen.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A14IOClientOptionO8securityyAC10Starscream18CertificatePinning_pcACmF"></a>
+                    <a name="/s:8SocketIO0A14IOClientOptionO8securityyAcA11SSLSecurityCcACmF"></a>
                    <a name="//apple_ref/swift/Element/security(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO8securityyAC10Starscream18CertificatePinning_pcACmF">security(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO8securityyAcA11SSLSecurityCcACmF">security(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -757,7 +712,7 @@ over when reconnects happen.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">case</span> <span class="nf">security</span><span class="p">(</span><span class="kt">CertificatePinning</span><span class="p">)</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">case</span> <span class="nf">security</span><span class="p">(</span><span class="kt"><a href="../Classes/SSLSecurity.html">SSLSecurity</a></span><span class="p">)</span></code></pre>

                        </div>
                      </div>
@ -769,7 +724,7 @@ over when reconnects happen.</p>
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO10selfSignedyACSbcACmF"></a>
                    <a name="//apple_ref/swift/Element/selfSigned(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO10selfSignedyACSbcACmF">selfSigned(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO10selfSignedyACSbcACmF">selfSigned(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -796,7 +751,7 @@ over when reconnects happen.</p>
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO15sessionDelegateyACSo012NSURLSessionF0_pcACmF"></a>
                    <a name="//apple_ref/swift/Element/sessionDelegate(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO15sessionDelegateyACSo012NSURLSessionF0_pcACmF">sessionDelegate(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO15sessionDelegateyACSo012NSURLSessionF0_pcACmF">sessionDelegate(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -818,44 +773,15 @@ over when reconnects happen.</p>
                    </section>
                  </div>
                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:8SocketIO0A14IOClientOptionO7versionyAcA0A9IOVersionOcACmF"></a>
-                    <a name="//apple_ref/swift/Element/version(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO7versionyAcA0A9IOVersionOcACmF">version(_:<wbr>)</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        <p>The version of socket.io being used. This should match the server version. Default is 3.</p>
-
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">case</span> <span class="nf">version</span><span class="p">(</span><span class="kt"><a href="../Enums/SocketIOVersion.html">SocketIOVersion</a></span><span class="p">)</span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
              </ul>
            </div>
            <div class="task-group">
              <div class="task-name-container">
                <a name="/Properties"></a>
                <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
-</h3>
-                </div>
+                <a href="#/Properties">
+                  <h3 class="section-name">Properties</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -878,7 +804,7 @@ over when reconnects happen.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">description</span><span class="p">:</span> <span class="kt">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">description</span><span class="p">:</span> <span class="nf">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -891,11 +817,9 @@ over when reconnects happen.</p>
              <div class="task-name-container">
                <a name="/Operators"></a>
                <a name="//apple_ref/swift/Section/Operators" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Operators"></a>
-                  <h3 class="section-name"><p>Operators</p>
-</h3>
-                </div>
+                <a href="#/Operators">
+                  <h3 class="section-name">Operators</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -903,7 +827,7 @@ over when reconnects happen.</p>
                    <code>
                    <a name="/s:8SocketIO0A14IOClientOptionO2eeoiySbAC_ACtFZ"></a>
                    <a name="//apple_ref/swift/Method/==(_:_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO2eeoiySbAC_ACtFZ">==(_:<wbr>_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14IOClientOptionO2eeoiySbAC_ACtFZ">==(_:_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -968,8 +892,8 @@ over when reconnects happen.</p>
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Enums/SocketIOStatus.html
+++ b/docs/Enums/SocketIOStatus.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketIOStatus</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">@objc</span>
 <span class="kd">public</span> <span class="kd">enum</span> <span class="kt">SocketIOStatus</span> <span class="p">:</span> <span class="kt">Int</span><span class="p">,</span> <span class="kt">CustomStringConvertible</span></code></pre>

@ -249,11 +204,9 @@
              <div class="task-name-container">
                <a name="/Cases"></a>
                <a name="//apple_ref/swift/Section/Cases" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Cases"></a>
-                  <h3 class="section-name"><p>Cases</p>
-</h3>
-                </div>
+                <a href="#/Cases">
+                  <h3 class="section-name">Cases</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -370,11 +323,9 @@
              <div class="task-name-container">
                <a name="/Properties"></a>
                <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
-</h3>
-                </div>
+                <a href="#/Properties">
+                  <h3 class="section-name">Properties</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -396,7 +347,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">active</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">active</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -426,7 +377,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">description</span><span class="p">:</span> <span class="kt">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">description</span><span class="p">:</span> <span class="nf">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -441,8 +392,8 @@
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Enums/SocketIOVersion.html
+++ b/docs/Enums/SocketIOVersion.html
@ -1,316 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>SocketIOVersion Enumeration Reference</title>
-    <link rel="stylesheet" type="text/css" href="../css/jazzy.css" />
-    <link rel="stylesheet" type="text/css" href="../css/highlight.css" />
-    <meta charset="utf-8">
-    <script src="../js/jquery.min.js" defer></script>
-    <script src="../js/jazzy.js" defer></script>
-    
-    <script src="../js/lunr.min.js" defer></script>
-    <script src="../js/typeahead.jquery.js" defer></script>
-    <script src="../js/jazzy.search.js" defer></script>
-  </head>
-  <body>
-
-    <a name="//apple_ref/swift/Enum/SocketIOVersion" class="dashAnchor"></a>
-
-    <a title="SocketIOVersion Enumeration Reference"></a>
-
-    <header class="header">
-      <p class="header-col header-col--primary">
-        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
-        </a>
-         (100% documented)
-      </p>
-    
-      <p class="header-col--secondary">
-        <form role="search" action="../search.json">
-          <input type="text" placeholder="Search documentation" data-typeahead>
-        </form>
-      </p>
-    
-    
-    </header>
-
-    <p class="breadcrumbs">
-      <a class="breadcrumb" href="../index.html">SocketIO Reference</a>
-      <img class="carat" src="../img/carat.png" />
-      SocketIOVersion Enumeration Reference
-    </p>
-
-    <div class="content-wrapper">
-      <nav class="navigation">
-        <ul class="nav-groups">
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Guides.html">Guides</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
-              </li>
-            </ul>
-          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Classes.html">Classes</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Classes/SocketAnyEvent.html">SocketAnyEvent</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Classes/SocketEngine.html">SocketEngine</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Classes/SocketIOClient.html">SocketIOClient</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Classes/SocketManager.html">SocketManager</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Classes/SocketRawAckView.html">SocketRawAckView</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Classes/SocketRawView.html">SocketRawView</a>
-              </li>
-            </ul>
-          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Enums.html">Enumerations</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketAckStatus.html">SocketAckStatus</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketClientEvent.html">SocketClientEvent</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketEnginePacketType.html">SocketEnginePacketType</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOClientOption.html">SocketIOClientOption</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
-              </li>
-            </ul>
-          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Protocols/ConfigSettable.html">ConfigSettable</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Protocols/SocketData.html">SocketData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Protocols/SocketDataBufferable.html">SocketDataBufferable</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Protocols/SocketEngineClient.html">SocketEngineClient</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Protocols/SocketEnginePollable.html">SocketEnginePollable</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Protocols/SocketEngineSpec.html">SocketEngineSpec</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Protocols/SocketEngineWebsocket.html">SocketEngineWebsocket</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Protocols/SocketIOClientSpec.html">SocketIOClientSpec</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Protocols/SocketLogger.html">SocketLogger</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Protocols/SocketManagerSpec.html">SocketManagerSpec</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Protocols/SocketParsable.html">SocketParsable</a>
-              </li>
-            </ul>
-          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Structs.html">Structures</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Structs/SocketEventHandler.html">SocketEventHandler</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Structs/SocketIOClientConfiguration.html">SocketIOClientConfiguration</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Structs/SocketPacket.html">SocketPacket</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Structs/SocketPacket/PacketType.html">– PacketType</a>
-              </li>
-            </ul>
-          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Typealiases.html">Type Aliases</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Typealiases.html#/s:8SocketIO11AckCallbacka">AckCallback</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Typealiases.html#/s:8SocketIO14NormalCallbacka">NormalCallback</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Typealiases.html#/s:8SocketIO4Posta">Post</a>
-              </li>
-            </ul>
-          </li>
-        </ul>
-      </nav>
-      <article class="main-content">
-
-        <section class="section">
-          <div class="section-content top-matter">
-            <h1>SocketIOVersion</h1>
-              <div class="declaration">
-                <div class="language">
-                  
-                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">enum</span> <span class="kt">SocketIOVersion</span> <span class="p">:</span> <span class="kt">Int</span></code></pre>
-
-                </div>
-              </div>
-            <p>The socket.io version being used.</p>
-
-          </div>
-        </section>
-
-        <section class="section">
-          <div class="section-content">
-            <div class="task-group">
-              <ul class="item-container">
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:8SocketIO0A9IOVersionO3twoyA2CmF"></a>
-                    <a name="//apple_ref/swift/Element/two" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A9IOVersionO3twoyA2CmF">two</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        <p>socket.io 2, engine.io 3</p>
-
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">case</span> <span class="n">two</span> <span class="o">=</span> <span class="mi">2</span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:8SocketIO0A9IOVersionO5threeyA2CmF"></a>
-                    <a name="//apple_ref/swift/Element/three" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A9IOVersionO5threeyA2CmF">three</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        <p>socket.io 3, engine.io 4</p>
-
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">case</span> <span class="n">three</span> <span class="o">=</span> <span class="mi">3</span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </section>
-
-      </article>
-    </div>
-    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
-    </section>
-  </body>
-</div>
-</html>
--- a/docs/Enums/SocketParsableError.html
+++ b/docs/Enums/SocketParsableError.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketParsableError</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">enum</span> <span class="kt">SocketParsableError</span> <span class="p">:</span> <span class="kt">Error</span></code></pre>

                </div>
@ -248,11 +203,9 @@
              <div class="task-name-container">
                <a name="/Cases"></a>
                <a name="//apple_ref/swift/Section/Cases" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Cases"></a>
-                  <h3 class="section-name"><p>Cases</p>
-</h3>
-                </div>
+                <a href="#/Cases">
+                  <h3 class="section-name">Cases</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -344,8 +297,8 @@
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Extensions.html
+++ b/docs/Extensions.html
@ -1,567 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>Extensions  Reference</title>
-    <link rel="stylesheet" type="text/css" href="css/jazzy.css" />
-    <link rel="stylesheet" type="text/css" href="css/highlight.css" />
-    <meta charset="utf-8">
-    <script src="js/jquery.min.js" defer></script>
-    <script src="js/jazzy.js" defer></script>
-    
-    <script src="js/lunr.min.js" defer></script>
-    <script src="js/typeahead.jquery.js" defer></script>
-    <script src="js/jazzy.search.js" defer></script>
-  </head>
-  <body>
-
-    <a name="//apple_ref/swift/Section/Extensions" class="dashAnchor"></a>
-
-    <a title="Extensions  Reference"></a>
-
-    <header class="header">
-      <p class="header-col header-col--primary">
-        <a class="header-link" href="index.html">
-          SocketIO 16.0.0 Docs
-        </a>
-         (100% documented)
-      </p>
-    
-      <p class="header-col--secondary">
-        <form role="search" action="search.json">
-          <input type="text" placeholder="Search documentation" data-typeahead>
-        </form>
-      </p>
-    
-    
-    </header>
-
-    <p class="breadcrumbs">
-      <a class="breadcrumb" href="index.html">SocketIO Reference</a>
-      <img class="carat" src="img/carat.png" />
-      Extensions  Reference
-    </p>
-
-    <div class="content-wrapper">
-      <nav class="navigation">
-        <ul class="nav-groups">
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Guides.html">Guides</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="12to13.html">12to13</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="15to16.html">15to16</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="faq.html">FAQ</a>
-              </li>
-            </ul>
-          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Classes.html">Classes</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Classes/OnAckCallback.html">OnAckCallback</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Classes/SocketAckEmitter.html">SocketAckEmitter</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Classes/SocketAnyEvent.html">SocketAnyEvent</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Classes/SocketEngine.html">SocketEngine</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Classes/SocketIOClient.html">SocketIOClient</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Classes/SocketManager.html">SocketManager</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Classes/SocketRawAckView.html">SocketRawAckView</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Classes/SocketRawView.html">SocketRawView</a>
-              </li>
-            </ul>
-          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Enums.html">Enumerations</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketAckStatus.html">SocketAckStatus</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketClientEvent.html">SocketClientEvent</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketEnginePacketType.html">SocketEnginePacketType</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketIOClientOption.html">SocketIOClientOption</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketIOStatus.html">SocketIOStatus</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketParsableError.html">SocketParsableError</a>
-              </li>
-            </ul>
-          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Protocols.html">Protocols</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/ConfigSettable.html">ConfigSettable</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketData.html">SocketData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketDataBufferable.html">SocketDataBufferable</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketEngineClient.html">SocketEngineClient</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketEnginePollable.html">SocketEnginePollable</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketEngineSpec.html">SocketEngineSpec</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketEngineWebsocket.html">SocketEngineWebsocket</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketIOClientSpec.html">SocketIOClientSpec</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketLogger.html">SocketLogger</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketManagerSpec.html">SocketManagerSpec</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Protocols/SocketParsable.html">SocketParsable</a>
-              </li>
-            </ul>
-          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Structs.html">Structures</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Structs/SocketEventHandler.html">SocketEventHandler</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Structs/SocketIOClientConfiguration.html">SocketIOClientConfiguration</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Structs/SocketPacket.html">SocketPacket</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Structs/SocketPacket/PacketType.html">– PacketType</a>
-              </li>
-            </ul>
-          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Typealiases.html">Type Aliases</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Typealiases.html#/s:8SocketIO11AckCallbacka">AckCallback</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Typealiases.html#/s:8SocketIO14NormalCallbacka">NormalCallback</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Typealiases.html#/s:8SocketIO4Posta">Post</a>
-              </li>
-            </ul>
-          </li>
-        </ul>
-      </nav>
-      <article class="main-content">
-
-        <section class="section">
-          <div class="section-content top-matter">
-            <h1>Extensions</h1>
-            <p>The following extensions are available globally.</p>
-
-          </div>
-        </section>
-
-        <section class="section">
-          <div class="section-content">
-            <div class="task-group">
-              <ul class="item-container">
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:Sa"></a>
-                    <a name="//apple_ref/swift/Extension/Array" class="dashAnchor"></a>
-                    <a class="token" href="#/s:Sa">Array</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">extension</span> <span class="kt">Array</span> <span class="p">:</span> <span class="kt"><a href="Protocols/SocketData.html">SocketData</a></span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:Sb"></a>
-                    <a name="//apple_ref/swift/Extension/Bool" class="dashAnchor"></a>
-                    <a class="token" href="#/s:Sb">Bool</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">extension</span> <span class="kt">Bool</span> <span class="p">:</span> <span class="kt"><a href="Protocols/SocketData.html">SocketData</a></span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:SD"></a>
-                    <a name="//apple_ref/swift/Extension/Dictionary" class="dashAnchor"></a>
-                    <a class="token" href="#/s:SD">Dictionary</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">extension</span> <span class="kt">Dictionary</span> <span class="p">:</span> <span class="kt"><a href="Protocols/SocketData.html">SocketData</a></span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:Sd"></a>
-                    <a name="//apple_ref/swift/Extension/Double" class="dashAnchor"></a>
-                    <a class="token" href="#/s:Sd">Double</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">extension</span> <span class="kt">Double</span> <span class="p">:</span> <span class="kt"><a href="Protocols/SocketData.html">SocketData</a></span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:Si"></a>
-                    <a name="//apple_ref/swift/Extension/Int" class="dashAnchor"></a>
-                    <a class="token" href="#/s:Si">Int</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">extension</span> <span class="kt">Int</span> <span class="p">:</span> <span class="kt"><a href="Protocols/SocketData.html">SocketData</a></span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/c:objc(cs)NSArray"></a>
-                    <a name="//apple_ref/swift/Extension/NSArray" class="dashAnchor"></a>
-                    <a class="token" href="#/c:objc(cs)NSArray">NSArray</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">extension</span> <span class="kt">NSArray</span> <span class="p">:</span> <span class="kt"><a href="Protocols/SocketData.html">SocketData</a></span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:10Foundation4DataV"></a>
-                    <a name="//apple_ref/swift/Extension/Data" class="dashAnchor"></a>
-                    <a class="token" href="#/s:10Foundation4DataV">Data</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">extension</span> <span class="kt">Data</span> <span class="p">:</span> <span class="kt"><a href="Protocols/SocketData.html">SocketData</a></span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/c:objc(cs)NSData"></a>
-                    <a name="//apple_ref/swift/Extension/NSData" class="dashAnchor"></a>
-                    <a class="token" href="#/c:objc(cs)NSData">NSData</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">extension</span> <span class="kt">NSData</span> <span class="p">:</span> <span class="kt"><a href="Protocols/SocketData.html">SocketData</a></span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/c:objc(cs)NSDictionary"></a>
-                    <a name="//apple_ref/swift/Extension/NSDictionary" class="dashAnchor"></a>
-                    <a class="token" href="#/c:objc(cs)NSDictionary">NSDictionary</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">extension</span> <span class="kt">NSDictionary</span> <span class="p">:</span> <span class="kt"><a href="Protocols/SocketData.html">SocketData</a></span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/c:objc(cs)NSString"></a>
-                    <a name="//apple_ref/swift/Extension/NSString" class="dashAnchor"></a>
-                    <a class="token" href="#/c:objc(cs)NSString">NSString</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">extension</span> <span class="kt">NSString</span> <span class="p">:</span> <span class="kt"><a href="Protocols/SocketData.html">SocketData</a></span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/c:objc(cs)NSNull"></a>
-                    <a name="//apple_ref/swift/Extension/NSNull" class="dashAnchor"></a>
-                    <a class="token" href="#/c:objc(cs)NSNull">NSNull</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">extension</span> <span class="kt">NSNull</span> <span class="p">:</span> <span class="kt"><a href="Protocols/SocketData.html">SocketData</a></span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:SS"></a>
-                    <a name="//apple_ref/swift/Extension/String" class="dashAnchor"></a>
-                    <a class="token" href="#/s:SS">String</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">extension</span> <span class="kt">String</span> <span class="p">:</span> <span class="kt"><a href="Protocols/SocketData.html">SocketData</a></span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </section>
-
-      </article>
-    </div>
-    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
-    </section>
-  </body>
-</div>
-</html>
--- a/docs/Guides.html
+++ b/docs/Guides.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,7 +184,7 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>Guides</h1>
            <p>The following guides are available globally.</p>

@ -237,45 +193,14 @@

        <section class="section">
          <div class="section-content">
-            <div class="task-group">
-              <ul class="item-container">
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/documentation.15to16"></a>
-                    <a name="//apple_ref/swift/Guide/15to16" class="dashAnchor"></a>
-                    <a class="direct-link" href="15to16.html">15to16</a>
-                    </code>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/documentation.FAQ"></a>
-                    <a name="//apple_ref/swift/Guide/FAQ" class="dashAnchor"></a>
-                    <a class="direct-link" href="faq.html">FAQ</a>
-                    </code>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/documentation.12to13"></a>
-                    <a name="//apple_ref/swift/Guide/12to13" class="dashAnchor"></a>
-                    <a class="direct-link" href="12to13.html">12to13</a>
-                    </code>
-                  </div>
-                </li>
-              </ul>
-            </div>
          </div>
        </section>

      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Protocols.html
+++ b/docs/Protocols.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,7 +184,7 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>Protocols</h1>
            <p>The following protocols are available globally.</p>

@ -267,6 +223,10 @@
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
@ -295,6 +255,10 @@
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
@ -324,6 +288,10 @@
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
@ -352,12 +320,16 @@
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec"></a>
                    <a name="//apple_ref/swift/Protocol/SocketEngineSpec" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP">SocketEngineSpec</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec">SocketEngineSpec</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -373,13 +345,18 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">protocol</span> <span class="kt">SocketEngineSpec</span> <span class="p">:</span> <span class="kt">AnyObject</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">@objc</span>
+<span class="kd">public</span> <span class="kd">protocol</span> <span class="kt">SocketEngineSpec</span></code></pre>

                        </div>
                      </div>
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
@ -408,12 +385,16 @@
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec"></a>
                    <a name="//apple_ref/swift/Protocol/SocketManagerSpec" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP">SocketManagerSpec</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec">SocketManagerSpec</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -426,7 +407,7 @@
 <p>A <code>SocketManagerSpec</code> is responsible for multiplexing multiple namespaces through a single <code><a href="Protocols/SocketEngineSpec.html">SocketEngineSpec</a></code>.</p>

 <p>Example with <code><a href="Classes/SocketManager.html">SocketManager</a></code>:</p>
-<pre class="highlight swift"><code><span class="k">let</span> <span class="nv">manager</span> <span class="o">=</span> <span class="kt">SocketManager</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="kt">URL</span><span class="p">(</span><span class="nv">string</span><span class="p">:</span><span class="s">"http://localhost:8080/"</span><span class="p">)</span><span class="o">!</span><span class="p">)</span>
+<pre class="highlight swift"><code><span class="k">let</span> <span class="nv">manager</span> <span class="o">=</span> <span class="nf">SocketManager</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="nf">URL</span><span class="p">(</span><span class="nv">string</span><span class="p">:</span><span class="s">"http://localhost:8080/"</span><span class="p">)</span><span class="o">!</span><span class="p">)</span>
 <span class="k">let</span> <span class="nv">defaultNamespaceSocket</span> <span class="o">=</span> <span class="n">manager</span><span class="o">.</span><span class="n">defaultSocket</span>
 <span class="k">let</span> <span class="nv">swiftSocket</span> <span class="o">=</span> <span class="n">manager</span><span class="o">.</span><span class="nf">socket</span><span class="p">(</span><span class="nv">forNamespace</span><span class="p">:</span> <span class="s">"/swift"</span><span class="p">)</span>

@ -436,7 +417,7 @@
 <p>Sockets created through the manager are retained by the manager. So at the very least, a single strong reference
 to the manager must be maintained to keep sockets alive.</p>

-<p>To disconnect a socket and remove it from the manager, either call <code><a href="Classes/SocketIOClient.html#/s:8SocketIO0A8IOClientC10disconnectyyF">SocketIOClient.disconnect()</a></code> on the socket,
+<p>To disconnect a socket and remove it from the manager, either call <code><a href="Classes/SocketIOClient.html#/c:@M@SocketIO@objc(cs)SocketIOClient(im)disconnect">SocketIOClient.disconnect()</a></code> on the socket,
 or call one of the <code>disconnectSocket</code> methods on this class.</p>

                        <a href="Protocols/SocketManagerSpec.html" class="slightly-smaller">See more</a>
@ -445,13 +426,18 @@ or call one of the <code>disconnectSocket</code> methods on this class.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">protocol</span> <span class="kt">SocketManagerSpec</span> <span class="p">:</span> <span class="kt">AnyObject</span><span class="p">,</span> <span class="kt"><a href="Protocols/SocketEngineClient.html">SocketEngineClient</a></span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">@objc</span>
+<span class="kd">public</span> <span class="kd">protocol</span> <span class="kt">SocketManagerSpec</span> <span class="p">:</span> <span class="kt">AnyObject</span><span class="p">,</span> <span class="kt"><a href="Protocols/SocketEngineClient.html">SocketEngineClient</a></span></code></pre>

                        </div>
                      </div>
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
@ -508,6 +494,10 @@ or call one of the <code>disconnectSocket</code> methods on this class.</p>
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
@ -536,6 +526,10 @@ or call one of the <code>disconnectSocket</code> methods on this class.</p>
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
@ -552,16 +546,16 @@ or call one of the <code>disconnectSocket</code> methods on this class.</p>
                        <p>A marking protocol that says a type can be represented in a socket.io packet.</p>

 <p>Example:</p>
-<pre class="highlight swift"><code><span class="kd">struct</span> <span class="kt">CustomData</span> <span class="p">:</span> <span class="kt">SocketData</span> <span class="p">{</span>
+<pre class="highlight swift"><code><span class="kd">struct</span> <span class="kt">CustomData</span> <span class="p">:</span> <span class="nf">SocketData</span> <span class="p">{</span>
   <span class="k">let</span> <span class="nv">name</span><span class="p">:</span> <span class="kt">String</span>
   <span class="k">let</span> <span class="nv">age</span><span class="p">:</span> <span class="kt">Int</span>

-   <span class="kd">func</span> <span class="nf">socketRepresentation</span><span class="p">()</span> <span class="o">-&gt;</span> <span class="kt">SocketData</span> <span class="p">{</span>
+   <span class="kd">func</span> <span class="nf">socketRepresentation</span><span class="p">()</span> <span class="o">-&gt;</span> <span class="nf">SocketData</span> <span class="p">{</span>
       <span class="k">return</span> <span class="p">[</span><span class="s">"name"</span><span class="p">:</span> <span class="n">name</span><span class="p">,</span> <span class="s">"age"</span><span class="p">:</span> <span class="n">age</span><span class="p">]</span>
   <span class="p">}</span>
 <span class="p">}</span>

-<span class="n">socket</span><span class="o">.</span><span class="nf">emit</span><span class="p">(</span><span class="s">"myEvent"</span><span class="p">,</span> <span class="kt">CustomData</span><span class="p">(</span><span class="nv">name</span><span class="p">:</span> <span class="s">"Erik"</span><span class="p">,</span> <span class="nv">age</span><span class="p">:</span> <span class="mi">24</span><span class="p">))</span>
+<span class="n">socket</span><span class="o">.</span><span class="nf">emit</span><span class="p">(</span><span class="s">"myEvent"</span><span class="p">,</span> <span class="nf">CustomData</span><span class="p">(</span><span class="nv">name</span><span class="p">:</span> <span class="s">"Erik"</span><span class="p">,</span> <span class="nv">age</span><span class="p">:</span> <span class="mi">24</span><span class="p">))</span>
 </code></pre>

                        <a href="Protocols/SocketData.html" class="slightly-smaller">See more</a>
@ -585,8 +579,8 @@ or call one of the <code>disconnectSocket</code> methods on this class.</p>
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Protocols/ConfigSettable.html
+++ b/docs/Protocols/ConfigSettable.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>ConfigSettable</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">protocol</span> <span class="kt">ConfigSettable</span></code></pre>

                </div>
@ -248,11 +203,9 @@
              <div class="task-name-container">
                <a name="/Methods"></a>
                <a name="//apple_ref/swift/Section/Methods" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Methods"></a>
-                  <h3 class="section-name"><p>Methods</p>
-</h3>
-                </div>
+                <a href="#/Methods">
+                  <h3 class="section-name">Methods</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -260,7 +213,7 @@
                    <code>
                    <a name="/s:8SocketIO14ConfigSettableP10setConfigsyyAA0A21IOClientConfigurationVF"></a>
                    <a name="//apple_ref/swift/Method/setConfigs(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO14ConfigSettableP10setConfigsyyAA0A21IOClientConfigurationVF">setConfigs(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO14ConfigSettableP10setConfigsyyAA0A21IOClientConfigurationVF">setConfigs(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -309,8 +262,8 @@
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Protocols/SocketData.html
+++ b/docs/Protocols/SocketData.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketData</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">protocol</span> <span class="kt">SocketData</span></code></pre>

                </div>
@ -240,16 +195,16 @@
            <p>A marking protocol that says a type can be represented in a socket.io packet.</p>

 <p>Example:</p>
-<pre class="highlight swift"><code><span class="kd">struct</span> <span class="kt">CustomData</span> <span class="p">:</span> <span class="kt">SocketData</span> <span class="p">{</span>
+<pre class="highlight swift"><code><span class="kd">struct</span> <span class="kt">CustomData</span> <span class="p">:</span> <span class="nf">SocketData</span> <span class="p">{</span>
   <span class="k">let</span> <span class="nv">name</span><span class="p">:</span> <span class="kt">String</span>
   <span class="k">let</span> <span class="nv">age</span><span class="p">:</span> <span class="kt">Int</span>

-   <span class="kd">func</span> <span class="nf">socketRepresentation</span><span class="p">()</span> <span class="o">-&gt;</span> <span class="kt">SocketData</span> <span class="p">{</span>
+   <span class="kd">func</span> <span class="nf">socketRepresentation</span><span class="p">()</span> <span class="o">-&gt;</span> <span class="nf">SocketData</span> <span class="p">{</span>
       <span class="k">return</span> <span class="p">[</span><span class="s">"name"</span><span class="p">:</span> <span class="n">name</span><span class="p">,</span> <span class="s">"age"</span><span class="p">:</span> <span class="n">age</span><span class="p">]</span>
   <span class="p">}</span>
 <span class="p">}</span>

-<span class="n">socket</span><span class="o">.</span><span class="nf">emit</span><span class="p">(</span><span class="s">"myEvent"</span><span class="p">,</span> <span class="kt">CustomData</span><span class="p">(</span><span class="nv">name</span><span class="p">:</span> <span class="s">"Erik"</span><span class="p">,</span> <span class="nv">age</span><span class="p">:</span> <span class="mi">24</span><span class="p">))</span>
+<span class="n">socket</span><span class="o">.</span><span class="nf">emit</span><span class="p">(</span><span class="s">"myEvent"</span><span class="p">,</span> <span class="nf">CustomData</span><span class="p">(</span><span class="nv">name</span><span class="p">:</span> <span class="s">"Erik"</span><span class="p">,</span> <span class="nv">age</span><span class="p">:</span> <span class="mi">24</span><span class="p">))</span>
 </code></pre>

          </div>
@ -261,11 +216,9 @@
              <div class="task-name-container">
                <a name="/Methods"></a>
                <a name="//apple_ref/swift/Section/Methods" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Methods"></a>
-                  <h3 class="section-name"><p>Methods</p>
-</h3>
-                </div>
+                <a href="#/Methods">
+                  <h3 class="section-name">Methods</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -311,8 +264,8 @@
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Protocols/SocketDataBufferable.html
+++ b/docs/Protocols/SocketDataBufferable.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketDataBufferable</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">protocol</span> <span class="kt">SocketDataBufferable</span> <span class="p">:</span> <span class="kt">AnyObject</span></code></pre>

                </div>
@ -248,11 +203,9 @@
              <div class="task-name-container">
                <a name="/Properties"></a>
                <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
-</h3>
-                </div>
+                <a href="#/Properties">
+                  <h3 class="section-name">Properties</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -295,8 +248,8 @@ So this should ideally be an array of one packet waiting for data.</p>
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Protocols/SocketEngineClient.html
+++ b/docs/Protocols/SocketEngineClient.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketEngineClient</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">@objc</span>
 <span class="kd">public</span> <span class="kd">protocol</span> <span class="kt">SocketEngineClient</span></code></pre>

@ -249,11 +204,9 @@
              <div class="task-name-container">
                <a name="/Methods"></a>
                <a name="//apple_ref/swift/Section/Methods" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Methods"></a>
-                  <h3 class="section-name"><p>Methods</p>
-</h3>
-                </div>
+                <a href="#/Methods">
+                  <h3 class="section-name">Methods</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -261,7 +214,7 @@
                    <code>
                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineClient(im)engineDidErrorWithReason:"></a>
                    <a name="//apple_ref/swift/Method/engineDidError(reason:)" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineClient(im)engineDidErrorWithReason:">engineDidError(reason:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineClient(im)engineDidErrorWithReason:">engineDidError(reason:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -307,7 +260,7 @@
                    <code>
                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineClient(im)engineDidCloseWithReason:"></a>
                    <a name="//apple_ref/swift/Method/engineDidClose(reason:)" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineClient(im)engineDidCloseWithReason:">engineDidClose(reason:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineClient(im)engineDidCloseWithReason:">engineDidClose(reason:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -353,7 +306,7 @@
                    <code>
                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineClient(im)engineDidOpenWithReason:"></a>
                    <a name="//apple_ref/swift/Method/engineDidOpen(reason:)" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineClient(im)engineDidOpenWithReason:">engineDidOpen(reason:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineClient(im)engineDidOpenWithReason:">engineDidOpen(reason:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -394,33 +347,6 @@
                    </section>
                  </div>
                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineClient(im)engineDidReceivePing"></a>
-                    <a name="//apple_ref/swift/Method/engineDidReceivePing()" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineClient(im)engineDidReceivePing">engineDidReceivePing()</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        <p>Called when the engine receives a ping message. Only called in socket.io &gt;3.</p>
-
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">func</span> <span class="nf">engineDidReceivePing</span><span class="p">()</span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
                <li class="item">
                  <div>
                    <code>
@ -434,7 +360,7 @@
                    <section class="section">
                      <div class="pointer"></div>
                      <div class="abstract">
-                        <p>Called when the engine receives a pong message. Only called in socket.io 2.</p>
+                        <p>Called when the engine receives a pong message.</p>

                      </div>
                      <div class="declaration">
@ -461,7 +387,7 @@
                    <section class="section">
                      <div class="pointer"></div>
                      <div class="abstract">
-                        <p>Called when the engine sends a ping to the server. Only called in socket.io 2.</p>
+                        <p>Called when the engine sends a ping to the server.</p>

                      </div>
                      <div class="declaration">
@ -475,39 +401,12 @@
                    </section>
                  </div>
                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineClient(im)engineDidSendPong"></a>
-                    <a name="//apple_ref/swift/Method/engineDidSendPong()" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineClient(im)engineDidSendPong">engineDidSendPong()</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        <p>Called when the engine sends a pong to the server. Only called in socket.io &gt;3.</p>
-
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">func</span> <span class="nf">engineDidSendPong</span><span class="p">()</span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
                <li class="item">
                  <div>
                    <code>
                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineClient(im)parseEngineMessage:"></a>
                    <a name="//apple_ref/swift/Method/parseEngineMessage(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineClient(im)parseEngineMessage:">parseEngineMessage(_:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineClient(im)parseEngineMessage:">parseEngineMessage(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -553,7 +452,7 @@
                    <code>
                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineClient(im)parseEngineBinaryData:"></a>
                    <a name="//apple_ref/swift/Method/parseEngineBinaryData(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineClient(im)parseEngineBinaryData:">parseEngineBinaryData(_:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineClient(im)parseEngineBinaryData:">parseEngineBinaryData(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -599,7 +498,7 @@
                    <code>
                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineClient(im)engineDidWebsocketUpgradeWithHeaders:"></a>
                    <a name="//apple_ref/swift/Method/engineDidWebsocketUpgrade(headers:)" class="dashAnchor"></a>
-                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineClient(im)engineDidWebsocketUpgradeWithHeaders:">engineDidWebsocketUpgrade(headers:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineClient(im)engineDidWebsocketUpgradeWithHeaders:">engineDidWebsocketUpgrade(headers:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -648,8 +547,8 @@
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Protocols/SocketEnginePollable.html
+++ b/docs/Protocols/SocketEnginePollable.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketEnginePollable</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">protocol</span> <span class="kt">SocketEnginePollable</span> <span class="p">:</span> <span class="kt"><a href="../Protocols/SocketEngineSpec.html">SocketEngineSpec</a></span></code></pre>

                </div>
@ -248,11 +203,9 @@
              <div class="task-name-container">
                <a name="/Properties"></a>
                <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
-</h3>
-                </div>
+                <a href="#/Properties">
+                  <h3 class="section-name">Properties</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -275,7 +228,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">invalidated</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">invalidated</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -331,7 +284,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">session</span><span class="p">:</span> <span class="kt">URLSession</span><span class="p">?</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">session</span><span class="p">:</span> <span class="nf">URLSession</span><span class="p">?</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -361,7 +314,7 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">waitingForPoll</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">waitingForPoll</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -391,7 +344,7 @@ disconnect us.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">waitingForPost</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">waitingForPost</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -404,11 +357,9 @@ disconnect us.</p>
              <div class="task-name-container">
                <a name="/Methods"></a>
                <a name="//apple_ref/swift/Section/Methods" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Methods"></a>
-                  <h3 class="section-name"><p>Methods</p>
-</h3>
-                </div>
+                <a href="#/Methods">
+                  <h3 class="section-name">Methods</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -455,7 +406,7 @@ disconnect us.</p>
                    <code>
                    <a name="/s:8SocketIO0A14EnginePollableP15sendPollMessage_8withType0H4Data10completionySS_AA0ac6PacketI0OSay10Foundation0J0VGyycSgtF"></a>
                    <a name="//apple_ref/swift/Method/sendPollMessage(_:withType:withData:completion:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A14EnginePollableP15sendPollMessage_8withType0H4Data10completionySS_AA0ac6PacketI0OSay10Foundation0J0VGyycSgtF">sendPollMessage(_:<wbr>withType:<wbr>withData:<wbr>completion:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A14EnginePollableP15sendPollMessage_8withType0H4Data10completionySS_AA0ac6PacketI0OSay10Foundation0J0VGyycSgtF">sendPollMessage(_:withType:withData:completion:)</a>
                    </code>
                      <span class="declaration-note">
                        Default implementation
@ -575,8 +526,8 @@ disconnect us.</p>
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Protocols/SocketEngineSpec.html
+++ b/docs/Protocols/SocketEngineSpec.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,12 +184,12 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketEngineSpec</h1>
              <div class="declaration">
                <div class="language">
-                  
-                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">protocol</span> <span class="kt">SocketEngineSpec</span> <span class="p">:</span> <span class="kt">AnyObject</span></code></pre>
+                  <pre class="highlight swift"><code><span class="kd">@objc</span>
+<span class="kd">public</span> <span class="kd">protocol</span> <span class="kt">SocketEngineSpec</span></code></pre>

                </div>
              </div>
@ -248,19 +204,17 @@
              <div class="task-name-container">
                <a name="/Properties"></a>
                <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
-</h3>
-                </div>
+                <a href="#/Properties">
+                  <h3 class="section-name">Properties</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP6clientAA0aC6Client_pSgvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)client"></a>
                    <a name="//apple_ref/swift/Property/client" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP6clientAA0aC6Client_pSgvp">client</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)client">client</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -275,7 +229,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">client</span><span class="p">:</span> <span class="kt"><a href="../Protocols/SocketEngineClient.html">SocketEngineClient</a></span><span class="p">?</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">client</span><span class="p">:</span> <span class="nf">SocketEngineClient</span><span class="p">?</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -285,9 +239,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP6closedSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)closed"></a>
                    <a name="//apple_ref/swift/Property/closed" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP6closedSbvp">closed</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)closed">closed</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -302,7 +256,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">closed</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">closed</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -312,9 +266,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP8compressSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)compress"></a>
                    <a name="//apple_ref/swift/Property/compress" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP8compressSbvp">compress</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)compress">compress</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -329,7 +283,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">compress</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">compress</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -339,9 +293,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP9connectedSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)connected"></a>
                    <a name="//apple_ref/swift/Property/connected" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP9connectedSbvp">connected</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)connected">connected</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -356,7 +310,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">connected</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">connected</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -366,9 +320,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP13connectParamsSDySSypGSgvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)connectParams"></a>
                    <a name="//apple_ref/swift/Property/connectParams" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP13connectParamsSDySSypGSgvp">connectParams</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)connectParams">connectParams</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -393,9 +347,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP7cookiesSaySo12NSHTTPCookieCGSgvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)cookies"></a>
                    <a name="//apple_ref/swift/Property/cookies" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP7cookiesSaySo12NSHTTPCookieCGSgvp">cookies</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)cookies">cookies</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -420,9 +374,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP11engineQueueSo17OS_dispatch_queueCvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)engineQueue"></a>
                    <a name="//apple_ref/swift/Property/engineQueue" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP11engineQueueSo17OS_dispatch_queueCvp">engineQueue</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)engineQueue">engineQueue</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -437,7 +391,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">engineQueue</span><span class="p">:</span> <span class="kt">DispatchQueue</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">engineQueue</span><span class="p">:</span> <span class="nf">DispatchQueue</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -447,9 +401,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP12extraHeadersSDyS2SGSgvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)extraHeaders"></a>
                    <a name="//apple_ref/swift/Property/extraHeaders" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP12extraHeadersSDyS2SGSgvp">extraHeaders</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)extraHeaders">extraHeaders</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -474,9 +428,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP11fastUpgradeSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)fastUpgrade"></a>
                    <a name="//apple_ref/swift/Property/fastUpgrade" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP11fastUpgradeSbvp">fastUpgrade</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)fastUpgrade">fastUpgrade</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -491,7 +445,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">fastUpgrade</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">fastUpgrade</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -501,9 +455,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP12forcePollingSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)forcePolling"></a>
                    <a name="//apple_ref/swift/Property/forcePolling" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP12forcePollingSbvp">forcePolling</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)forcePolling">forcePolling</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -518,7 +472,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">forcePolling</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">forcePolling</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -528,9 +482,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP15forceWebsocketsSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)forceWebsockets"></a>
                    <a name="//apple_ref/swift/Property/forceWebsockets" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP15forceWebsocketsSbvp">forceWebsockets</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)forceWebsockets">forceWebsockets</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -545,7 +499,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">forceWebsockets</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">forceWebsockets</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -555,9 +509,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP7pollingSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)polling"></a>
                    <a name="//apple_ref/swift/Property/polling" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP7pollingSbvp">polling</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)polling">polling</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -572,7 +526,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">polling</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">polling</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -582,9 +536,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP7probingSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)probing"></a>
                    <a name="//apple_ref/swift/Property/probing" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP7probingSbvp">probing</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)probing">probing</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -599,7 +553,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">probing</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">probing</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -609,9 +563,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP3sidSSvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)sid"></a>
                    <a name="//apple_ref/swift/Property/sid" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP3sidSSvp">sid</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)sid">sid</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -626,7 +580,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">sid</span><span class="p">:</span> <span class="kt">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">sid</span><span class="p">:</span> <span class="nf">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -636,9 +590,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP10socketPathSSvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)socketPath"></a>
                    <a name="//apple_ref/swift/Property/socketPath" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP10socketPathSSvp">socketPath</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)socketPath">socketPath</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -653,7 +607,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">socketPath</span><span class="p">:</span> <span class="kt">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">socketPath</span><span class="p">:</span> <span class="nf">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -663,9 +617,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP10urlPolling10Foundation3URLVvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)urlPolling"></a>
                    <a name="//apple_ref/swift/Property/urlPolling" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP10urlPolling10Foundation3URLVvp">urlPolling</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)urlPolling">urlPolling</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -680,7 +634,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">urlPolling</span><span class="p">:</span> <span class="kt">URL</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">urlPolling</span><span class="p">:</span> <span class="nf">URL</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -690,9 +644,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP06urlWebA010Foundation3URLVvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)urlWebSocket"></a>
                    <a name="//apple_ref/swift/Property/urlWebSocket" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP06urlWebA010Foundation3URLVvp">urlWebSocket</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)urlWebSocket">urlWebSocket</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -707,7 +661,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">urlWebSocket</span><span class="p">:</span> <span class="kt">URL</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">urlWebSocket</span><span class="p">:</span> <span class="nf">URL</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -717,36 +671,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP7versionAA0A9IOVersionOvp"></a>
-                    <a name="//apple_ref/swift/Property/version" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP7versionAA0A9IOVersionOvp">version</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        <p>The version of engine.io being used. Default is three.</p>
-
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">version</span><span class="p">:</span> <span class="kt"><a href="../Enums/SocketIOVersion.html">SocketIOVersion</a></span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP9websocketSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)websocket"></a>
                    <a name="//apple_ref/swift/Property/websocket" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP9websocketSbvp">websocket</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)websocket">websocket</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -761,8 +688,8 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">@available</span><span class="p">(</span><span class="o">*</span><span class="p">,</span> <span class="n">deprecated</span><span class="p">,</span> <span class="nv">message</span><span class="p">:</span> <span class="s">"No longer needed, if we're not polling, then we must be doing websockets"</span><span class="p">)</span>
-<span class="k">var</span> <span class="nv">websocket</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">@available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets")</span>
+<span class="k">var</span> <span class="nv">websocket</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -772,9 +699,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP2ws10Starscream03WebA0CSgvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)ws"></a>
                    <a name="//apple_ref/swift/Property/ws" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP2ws10Starscream03WebA0CSgvp">ws</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(py)ws">ws</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -789,7 +716,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">ws</span><span class="p">:</span> <span class="kt">WebSocket</span><span class="p">?</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">ws</span><span class="p">:</span> <span class="nf">WebSocket</span><span class="p">?</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -802,19 +729,17 @@
              <div class="task-name-container">
                <a name="/Initializers"></a>
                <a name="//apple_ref/swift/Section/Initializers" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Initializers"></a>
-                  <h3 class="section-name"><p>Initializers</p>
-</h3>
-                </div>
+                <a href="#/Initializers">
+                  <h3 class="section-name">Initializers</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP6client3url7optionsxAA0aC6Client_p_10Foundation3URLVSDySSypGSgtcfc"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(im)initWithClient:url:options:"></a>
                    <a name="//apple_ref/swift/Method/init(client:url:options:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP6client3url7optionsxAA0aC6Client_p_10Foundation3URLVSDySSypGSgtcfc">init(client:<wbr>url:<wbr>options:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(im)initWithClient:url:options:">init(client:url:options:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -885,19 +810,17 @@
              <div class="task-name-container">
                <a name="/Methods"></a>
                <a name="//apple_ref/swift/Section/Methods" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Methods"></a>
-                  <h3 class="section-name"><p>Methods</p>
-</h3>
-                </div>
+                <a href="#/Methods">
+                  <h3 class="section-name">Methods</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP7connectyyF"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(im)connect"></a>
                    <a name="//apple_ref/swift/Method/connect()" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP7connectyyF">connect()</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(im)connect">connect()</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -922,9 +845,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP8didError6reasonySS_tF"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(im)didErrorWithReason:"></a>
                    <a name="//apple_ref/swift/Method/didError(reason:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP8didError6reasonySS_tF">didError(reason:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(im)didErrorWithReason:">didError(reason:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -949,9 +872,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP10disconnect6reasonySS_tF"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(im)disconnectWithReason:"></a>
                    <a name="//apple_ref/swift/Method/disconnect(reason:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP10disconnect6reasonySS_tF">disconnect(reason:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(im)disconnectWithReason:">disconnect(reason:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -995,9 +918,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP13doFastUpgradeyyF"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(im)doFastUpgrade"></a>
                    <a name="//apple_ref/swift/Method/doFastUpgrade()" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP13doFastUpgradeyyF">doFastUpgrade()</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(im)doFastUpgrade">doFastUpgrade()</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1025,9 +948,9 @@ WebSocket mode.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP024flushWaitingForPostToWebA0yyF"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(im)flushWaitingForPostToWebSocket"></a>
                    <a name="//apple_ref/swift/Method/flushWaitingForPostToWebSocket()" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP024flushWaitingForPostToWebA0yyF">flushWaitingForPostToWebSocket()</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(im)flushWaitingForPostToWebSocket">flushWaitingForPostToWebSocket()</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1055,9 +978,9 @@ the engine is attempting to upgrade to WebSocket it does not do any POSTing.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP05parseC4Datayy10Foundation0F0VF"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(im)parseEngineData:"></a>
                    <a name="//apple_ref/swift/Method/parseEngineData(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP05parseC4Datayy10Foundation0F0VF">parseEngineData(_:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(im)parseEngineData:">parseEngineData(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1101,9 +1024,9 @@ the engine is attempting to upgrade to WebSocket it does not do any POSTing.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP05parseC7MessageyySSF"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(im)parseEngineMessage:"></a>
                    <a name="//apple_ref/swift/Method/parseEngineMessage(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP05parseC7MessageyySSF">parseEngineMessage(_:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(im)parseEngineMessage:">parseEngineMessage(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1147,9 +1070,9 @@ the engine is attempting to upgrade to WebSocket it does not do any POSTing.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A10EngineSpecP5write_8withType0F4Data10completionySS_AA0ac6PacketG0OSay10Foundation0H0VGyycSgtF"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketEngineSpec(im)write:withType:withData:completion:"></a>
                    <a name="//apple_ref/swift/Method/write(_:withType:withData:completion:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A10EngineSpecP5write_8withType0F4Data10completionySS_AA0ac6PacketG0OSay10Foundation0H0VGyycSgtF">write(_:<wbr>withType:<wbr>withData:<wbr>completion:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketEngineSpec(im)write:withType:withData:completion:">write(_:withType:withData:completion:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1234,8 +1157,8 @@ the engine is attempting to upgrade to WebSocket it does not do any POSTing.</p>
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Protocols/SocketEngineWebsocket.html
+++ b/docs/Protocols/SocketEngineWebsocket.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketEngineWebsocket</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">protocol</span> <span class="kt">SocketEngineWebsocket</span> <span class="p">:</span> <span class="kt"><a href="../Protocols/SocketEngineSpec.html">SocketEngineSpec</a></span></code></pre>

                </div>
@ -244,55 +199,13 @@

        <section class="section">
          <div class="section-content">
-            <div class="task-group">
-              <div class="task-name-container">
-                <a name="/Properties"></a>
-                <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
-</h3>
-                </div>
-              </div>
-              <ul class="item-container">
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:8SocketIO0A15EngineWebsocketP11wsConnectedSbvp"></a>
-                    <a name="//apple_ref/swift/Property/wsConnected" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A15EngineWebsocketP11wsConnectedSbvp">wsConnected</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        <p>Whether or not the ws is connected</p>
-
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">wsConnected</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-              </ul>
-            </div>
            <div class="task-group">
              <div class="task-name-container">
                <a name="/Methods"></a>
                <a name="//apple_ref/swift/Section/Methods" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Methods"></a>
-                  <h3 class="section-name"><p>Methods</p>
-</h3>
-                </div>
+                <a href="#/Methods">
+                  <h3 class="section-name">Methods</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -300,7 +213,7 @@
                    <code>
                    <a name="/s:8SocketIO0A15EngineWebsocketP07sendWebA7Message_8withType0H4Data10completionySS_AA0ac6PacketI0OSay10Foundation0J0VGyycSgtF"></a>
                    <a name="//apple_ref/swift/Method/sendWebSocketMessage(_:withType:withData:completion:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A15EngineWebsocketP07sendWebA7Message_8withType0H4Data10completionySS_AA0ac6PacketI0OSay10Foundation0J0VGyycSgtF">sendWebSocketMessage(_:<wbr>withType:<wbr>withData:<wbr>completion:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A15EngineWebsocketP07sendWebA7Message_8withType0H4Data10completionySS_AA0ac6PacketI0OSay10Foundation0J0VGyycSgtF">sendWebSocketMessage(_:withType:withData:completion:)</a>
                    </code>
                      <span class="declaration-note">
                        Default implementation
@ -327,10 +240,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">func</span> <span class="nf">sendWebSocketMessage</span><span class="p">(</span><span class="n">_</span> <span class="nv">str</span><span class="p">:</span> <span class="kt">String</span><span class="p">,</span>
-                          <span class="n">withType</span> <span class="nv">type</span><span class="p">:</span> <span class="kt"><a href="../Enums/SocketEnginePacketType.html">SocketEnginePacketType</a></span><span class="p">,</span>
-                          <span class="n">withData</span> <span class="nv">datas</span><span class="p">:</span> <span class="p">[</span><span class="kt">Data</span><span class="p">],</span>
-                          <span class="nv">completion</span><span class="p">:</span> <span class="p">(()</span> <span class="o">-&gt;</span> <span class="p">())?)</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">func</span> <span class="nf">sendWebSocketMessage</span><span class="p">(</span><span class="n">_</span> <span class="nv">str</span><span class="p">:</span> <span class="kt">String</span><span class="p">,</span> <span class="n">withType</span> <span class="nv">type</span><span class="p">:</span> <span class="kt"><a href="../Enums/SocketEnginePacketType.html">SocketEnginePacketType</a></span><span class="p">,</span> <span class="n">withData</span> <span class="nv">datas</span><span class="p">:</span> <span class="p">[</span><span class="kt">Data</span><span class="p">],</span> <span class="nv">completion</span><span class="p">:</span> <span class="p">(()</span> <span class="o">-&gt;</span> <span class="p">())?)</span></code></pre>

                        </div>
                      </div>
@ -400,8 +310,8 @@
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Protocols/SocketIOClientSpec.html
+++ b/docs/Protocols/SocketIOClientSpec.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketIOClientSpec</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">protocol</span> <span class="kt">SocketIOClientSpec</span> <span class="p">:</span> <span class="kt">AnyObject</span></code></pre>

                </div>
@ -248,11 +203,9 @@
              <div class="task-name-container">
                <a name="/Properties"></a>
                <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
-</h3>
-                </div>
+                <a href="#/Properties">
+                  <h3 class="section-name">Properties</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -329,7 +282,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">manager</span><span class="p">:</span> <span class="kt"><a href="../Protocols/SocketManagerSpec.html">SocketManagerSpec</a></span><span class="p">?</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">manager</span><span class="p">:</span> <span class="nf">SocketManagerSpec</span><span class="p">?</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -358,7 +311,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">nsp</span><span class="p">:</span> <span class="kt">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">nsp</span><span class="p">:</span> <span class="nf">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -391,34 +344,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">rawEmitView</span><span class="p">:</span> <span class="kt"><a href="../Classes/SocketRawView.html">SocketRawView</a></span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:8SocketIO0A12IOClientSpecP3sidSSSgvp"></a>
-                    <a name="//apple_ref/swift/Property/sid" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP3sidSSSgvp">sid</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        <p>The id of this socket.io connect. This is different from the sid of the engine.io connection.</p>
-
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">sid</span><span class="p">:</span> <span class="kt">String</span><span class="p">?</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">rawEmitView</span><span class="p">:</span> <span class="nf">SocketRawView</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -445,7 +371,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">status</span><span class="p">:</span> <span class="kt"><a href="../Enums/SocketIOStatus.html">SocketIOStatus</a></span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">status</span><span class="p">:</span> <span class="nf">SocketIOStatus</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -458,19 +384,17 @@
              <div class="task-name-container">
                <a name="/Methods"></a>
                <a name="//apple_ref/swift/Section/Methods" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Methods"></a>
-                  <h3 class="section-name"><p>Methods</p>
-</h3>
-                </div>
+                <a href="#/Methods">
+                  <h3 class="section-name">Methods</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A12IOClientSpecP7connect11withPayloadySDySSypGSg_tF"></a>
-                    <a name="//apple_ref/swift/Method/connect(withPayload:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP7connect11withPayloadySDySSypGSg_tF">connect(withPayload:<wbr>)</a>
+                    <a name="/s:8SocketIO0A12IOClientSpecP7connectyyF"></a>
+                    <a name="//apple_ref/swift/Method/connect()" class="dashAnchor"></a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP7connectyyF">connect()</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -478,7 +402,7 @@
                    <section class="section">
                      <div class="pointer"></div>
                      <div class="abstract">
-                        <p>Connect to the server. The same as calling <code>connect(timeoutAfter:withHandler:)</code> with a timeout of 0.</p>
+                        <p>Connect to the server. The same as calling <code><a href="../Protocols/SocketIOClientSpec.html#/s:8SocketIO0A12IOClientSpecP7connect12timeoutAfter11withHandlerySd_yycSgtF">connect(timeoutAfter:withHandler:)</a></code> with a timeout of 0.</p>

 <p>Only call after adding your event listeners, unless you know what you&rsquo;re doing.</p>

@ -487,38 +411,19 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">func</span> <span class="nf">connect</span><span class="p">(</span><span class="n">withPayload</span> <span class="nv">payload</span><span class="p">:</span> <span class="p">[</span><span class="kt">String</span> <span class="p">:</span> <span class="kt">Any</span><span class="p">]?)</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">func</span> <span class="nf">connect</span><span class="p">()</span></code></pre>

                        </div>
                      </div>
-                      <div>
-                        <h4>Parameters</h4>
-                        <table class="graybox">
-                          <tbody>
-                            <tr>
-                              <td>
-                                <code>
-                                <em>payload</em>
-                                </code>
-                              </td>
-                              <td>
-                                <div>
-                                  <p>An optional payload sent on connect</p>
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                      </div>
                    </section>
                  </div>
                </li>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A12IOClientSpecP7connect11withPayload12timeoutAfter0F7HandlerySDySSypGSg_SdyycSgtF"></a>
-                    <a name="//apple_ref/swift/Method/connect(withPayload:timeoutAfter:withHandler:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP7connect11withPayload12timeoutAfter0F7HandlerySDySSypGSg_SdyycSgtF">connect(withPayload:<wbr>timeoutAfter:<wbr>withHandler:<wbr>)</a>
+                    <a name="/s:8SocketIO0A12IOClientSpecP7connect12timeoutAfter11withHandlerySd_yycSgtF"></a>
+                    <a name="//apple_ref/swift/Method/connect(timeoutAfter:withHandler:)" class="dashAnchor"></a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP7connect12timeoutAfter11withHandlerySd_yycSgtF">connect(timeoutAfter:withHandler:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -535,7 +440,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">func</span> <span class="nf">connect</span><span class="p">(</span><span class="n">withPayload</span> <span class="nv">payload</span><span class="p">:</span> <span class="p">[</span><span class="kt">String</span> <span class="p">:</span> <span class="kt">Any</span><span class="p">]?,</span> <span class="nv">timeoutAfter</span><span class="p">:</span> <span class="kt">Double</span><span class="p">,</span> <span class="n">withHandler</span> <span class="nv">handler</span><span class="p">:</span> <span class="p">(()</span> <span class="o">-&gt;</span> <span class="p">())?)</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">func</span> <span class="nf">connect</span><span class="p">(</span><span class="nv">timeoutAfter</span><span class="p">:</span> <span class="kt">Double</span><span class="p">,</span> <span class="n">withHandler</span> <span class="nv">handler</span><span class="p">:</span> <span class="p">(()</span> <span class="o">-&gt;</span> <span class="p">())?)</span></code></pre>

                        </div>
                      </div>
@ -543,18 +448,6 @@
                        <h4>Parameters</h4>
                        <table class="graybox">
                          <tbody>
-                            <tr>
-                              <td>
-                                <code>
-                                <em>withPayload</em>
-                                </code>
-                              </td>
-                              <td>
-                                <div>
-                                  <p>An optional payload sent on connect</p>
-                                </div>
-                              </td>
-                            </tr>
                            <tr>
                              <td>
                                <code>
@ -589,9 +482,9 @@
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A12IOClientSpecP10didConnect11toNamespace7payloadySS_SDySSypGSgtF"></a>
-                    <a name="//apple_ref/swift/Method/didConnect(toNamespace:payload:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP10didConnect11toNamespace7payloadySS_SDySSypGSgtF">didConnect(toNamespace:<wbr>payload:<wbr>)</a>
+                    <a name="/s:8SocketIO0A12IOClientSpecP10didConnect11toNamespaceySS_tF"></a>
+                    <a name="//apple_ref/swift/Method/didConnect(toNamespace:)" class="dashAnchor"></a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP10didConnect11toNamespaceySS_tF">didConnect(toNamespace:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -607,7 +500,7 @@ then this is only called when the client connects to that namespace.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">func</span> <span class="nf">didConnect</span><span class="p">(</span><span class="n">toNamespace</span> <span class="nv">namespace</span><span class="p">:</span> <span class="kt">String</span><span class="p">,</span> <span class="nv">payload</span><span class="p">:</span> <span class="p">[</span><span class="kt">String</span> <span class="p">:</span> <span class="kt">Any</span><span class="p">]?)</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">func</span> <span class="nf">didConnect</span><span class="p">(</span><span class="n">toNamespace</span> <span class="nv">namespace</span><span class="p">:</span> <span class="kt">String</span><span class="p">)</span></code></pre>

                        </div>
                      </div>
@ -638,7 +531,7 @@ then this is only called when the client connects to that namespace.</p>
                    <code>
                    <a name="/s:8SocketIO0A12IOClientSpecP13didDisconnect6reasonySS_tF"></a>
                    <a name="//apple_ref/swift/Method/didDisconnect(reason:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP13didDisconnect6reasonySS_tF">didDisconnect(reason:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP13didDisconnect6reasonySS_tF">didDisconnect(reason:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -684,7 +577,7 @@ then this is only called when the client connects to that namespace.</p>
                    <code>
                    <a name="/s:8SocketIO0A12IOClientSpecP8didError6reasonySS_tF"></a>
                    <a name="//apple_ref/swift/Method/didError(reason:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP8didError6reasonySS_tF">didError(reason:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP8didError6reasonySS_tF">didError(reason:)</a>
                    </code>
                      <span class="declaration-note">
                        Default implementation
@ -765,7 +658,7 @@ then this is only called when the client connects to that namespace.</p>
                    <code>
                    <a name="/s:8SocketIO0A12IOClientSpecP4emit__10completionySS_AA0A4Data_pdyycSgtF"></a>
                    <a name="//apple_ref/swift/Method/emit(_:_:completion:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP4emit__10completionySS_AA0A4Data_pdyycSgtF">emit(_:<wbr>_:<wbr>completion:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP4emit__10completionySS_AA0A4Data_pdyycSgtF">emit(_:_:completion:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -838,7 +731,7 @@ will be emitted. The structure of the error data is <code>[eventName, items, the
                    <code>
                    <a name="/s:8SocketIO0A12IOClientSpecP7emitAck_4withySi_SayypGtF"></a>
                    <a name="//apple_ref/swift/Method/emitAck(_:with:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP7emitAck_4withySi_SayypGtF">emitAck(_:<wbr>with:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP7emitAck_4withySi_SayypGtF">emitAck(_:with:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -896,7 +789,7 @@ will be emitted. The structure of the error data is <code>[eventName, items, the
                    <code>
                    <a name="/s:8SocketIO0A12IOClientSpecP11emitWithAckyAA02OnG8CallbackCSS_AA0A4Data_pdtF"></a>
                    <a name="//apple_ref/swift/Method/emitWithAck(_:_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP11emitWithAckyAA02OnG8CallbackCSS_AA0A4Data_pdtF">emitWithAck(_:<wbr>_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP11emitWithAckyAA02OnG8CallbackCSS_AA0A4Data_pdtF">emitWithAck(_:_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -970,7 +863,7 @@ will be emitted. The structure of the error data is <code>[eventName, items, the
                    <code>
                    <a name="/s:8SocketIO0A12IOClientSpecP9handleAck_4dataySi_SayypGtF"></a>
                    <a name="//apple_ref/swift/Method/handleAck(_:data:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP9handleAck_4dataySi_SayypGtF">handleAck(_:<wbr>data:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP9handleAck_4dataySi_SayypGtF">handleAck(_:data:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1028,7 +921,7 @@ will be emitted. The structure of the error data is <code>[eventName, items, the
                    <code>
                    <a name="/s:8SocketIO0A12IOClientSpecP17handleClientEvent_4datayAA0afG0O_SayypGtF"></a>
                    <a name="//apple_ref/swift/Method/handleClientEvent(_:data:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP17handleClientEvent_4datayAA0afG0O_SayypGtF">handleClientEvent(_:<wbr>data:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP17handleClientEvent_4datayAA0afG0O_SayypGtF">handleClientEvent(_:data:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1086,7 +979,7 @@ will be emitted. The structure of the error data is <code>[eventName, items, the
                    <code>
                    <a name="/s:8SocketIO0A12IOClientSpecP11handleEvent_4data17isInternalMessage7withAckySS_SayypGSbSitF"></a>
                    <a name="//apple_ref/swift/Method/handleEvent(_:data:isInternalMessage:withAck:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP11handleEvent_4data17isInternalMessage7withAckySS_SayypGSbSitF">handleEvent(_:<wbr>data:<wbr>isInternalMessage:<wbr>withAck:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP11handleEvent_4data17isInternalMessage7withAckySS_SayypGSbSitF">handleEvent(_:data:isInternalMessage:withAck:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1168,7 +1061,7 @@ will be emitted. The structure of the error data is <code>[eventName, items, the
                    <code>
                    <a name="/s:8SocketIO0A12IOClientSpecP12handlePacketyyAA0aF0VF"></a>
                    <a name="//apple_ref/swift/Method/handlePacket(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP12handlePacketyyAA0aF0VF">handlePacket(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP12handlePacketyyAA0aF0VF">handlePacket(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1240,9 +1133,9 @@ socket.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A12IOClientSpecP13joinNamespace11withPayloadySDySSypGSg_tF"></a>
-                    <a name="//apple_ref/swift/Method/joinNamespace(withPayload:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP13joinNamespace11withPayloadySDySSypGSg_tF">joinNamespace(withPayload:<wbr>)</a>
+                    <a name="/s:8SocketIO0A12IOClientSpecP13joinNamespaceyyF"></a>
+                    <a name="//apple_ref/swift/Method/joinNamespace()" class="dashAnchor"></a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP13joinNamespaceyyF">joinNamespace()</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1250,36 +1143,17 @@ socket.</p>
                    <section class="section">
                      <div class="pointer"></div>
                      <div class="abstract">
-                        <p>Joins <code><a href="../Protocols/SocketIOClientSpec.html#/s:8SocketIO0A12IOClientSpecP3nspSSvp">nsp</a></code>. You shouldn&rsquo;t need to call this directly, instead call <code>connect</code>.</p>
+                        <p>Joins <code><a href="../Protocols/SocketIOClientSpec.html#/s:8SocketIO0A12IOClientSpecP3nspSSvp">nsp</a></code>.</p>

                      </div>
                      <div class="declaration">
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">func</span> <span class="nf">joinNamespace</span><span class="p">(</span><span class="n">withPayload</span> <span class="nv">payload</span><span class="p">:</span> <span class="p">[</span><span class="kt">String</span> <span class="p">:</span> <span class="kt">Any</span><span class="p">]?)</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">func</span> <span class="nf">joinNamespace</span><span class="p">()</span></code></pre>

                        </div>
                      </div>
-                      <div>
-                        <h4>Parameters</h4>
-                        <table class="graybox">
-                          <tbody>
-                            <tr>
-                              <td>
-                                <code>
-                                <em>withPayload</em>
-                                </code>
-                              </td>
-                              <td>
-                                <div>
-                                  <p>The payload to connect when joining this namespace</p>
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                      </div>
                    </section>
                  </div>
                </li>
@ -1288,7 +1162,7 @@ socket.</p>
                    <code>
                    <a name="/s:8SocketIO0A12IOClientSpecP3off11clientEventyAA0a6ClientG0O_tF"></a>
                    <a name="//apple_ref/swift/Method/off(clientEvent:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP3off11clientEventyAA0a6ClientG0O_tF">off(clientEvent:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP3off11clientEventyAA0a6ClientG0O_tF">off(clientEvent:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1336,7 +1210,7 @@ socket.</p>
                    <code>
                    <a name="/s:8SocketIO0A12IOClientSpecP3offyySSF"></a>
                    <a name="//apple_ref/swift/Method/off(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP3offyySSF">off(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP3offyySSF">off(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1384,7 +1258,7 @@ socket.</p>
                    <code>
                    <a name="/s:8SocketIO0A12IOClientSpecP3off2idy10Foundation4UUIDV_tF"></a>
                    <a name="//apple_ref/swift/Method/off(id:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP3off2idy10Foundation4UUIDV_tF">off(id:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP3off2idy10Foundation4UUIDV_tF">off(id:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1432,7 +1306,7 @@ socket.</p>
                    <code>
                    <a name="/s:8SocketIO0A12IOClientSpecP2on_8callback10Foundation4UUIDVSS_ySayypG_AA0A10AckEmitterCtctF"></a>
                    <a name="//apple_ref/swift/Method/on(_:callback:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP2on_8callback10Foundation4UUIDVSS_ySayypG_AA0A10AckEmitterCtctF">on(_:<wbr>callback:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP2on_8callback10Foundation4UUIDVSS_ySayypG_AA0A10AckEmitterCtctF">on(_:callback:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1494,7 +1368,7 @@ socket.</p>
                    <code>
                    <a name="/s:8SocketIO0A12IOClientSpecP2on11clientEvent8callback10Foundation4UUIDVAA0a6ClientG0O_ySayypG_AA0A10AckEmitterCtctF"></a>
                    <a name="//apple_ref/swift/Method/on(clientEvent:callback:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP2on11clientEvent8callback10Foundation4UUIDVAA0a6ClientG0O_ySayypG_AA0A10AckEmitterCtctF">on(clientEvent:<wbr>callback:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP2on11clientEvent8callback10Foundation4UUIDVAA0a6ClientG0O_ySayypG_AA0A10AckEmitterCtctF">on(clientEvent:callback:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1562,7 +1436,7 @@ socket.</p>
                    <code>
                    <a name="/s:8SocketIO0A12IOClientSpecP4once11clientEvent8callback10Foundation4UUIDVAA0a6ClientG0O_ySayypG_AA0A10AckEmitterCtctF"></a>
                    <a name="//apple_ref/swift/Method/once(clientEvent:callback:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP4once11clientEvent8callback10Foundation4UUIDVAA0a6ClientG0O_ySayypG_AA0A10AckEmitterCtctF">once(clientEvent:<wbr>callback:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP4once11clientEvent8callback10Foundation4UUIDVAA0a6ClientG0O_ySayypG_AA0A10AckEmitterCtctF">once(clientEvent:callback:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1624,7 +1498,7 @@ socket.</p>
                    <code>
                    <a name="/s:8SocketIO0A12IOClientSpecP4once_8callback10Foundation4UUIDVSS_ySayypG_AA0A10AckEmitterCtctF"></a>
                    <a name="//apple_ref/swift/Method/once(_:callback:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP4once_8callback10Foundation4UUIDVSS_ySayypG_AA0A10AckEmitterCtctF">once(_:<wbr>callback:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP4once_8callback10Foundation4UUIDVSS_ySayypG_AA0A10AckEmitterCtctF">once(_:callback:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1686,7 +1560,7 @@ socket.</p>
                    <code>
                    <a name="/s:8SocketIO0A12IOClientSpecP5onAnyyyyAA0aF5EventCcF"></a>
                    <a name="//apple_ref/swift/Method/onAny(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP5onAnyyyyAA0aF5EventCcF">onAny(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP5onAnyyyyAA0aF5EventCcF">onAny(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1761,7 +1635,7 @@ socket.</p>
                    <code>
                    <a name="/s:8SocketIO0A12IOClientSpecP15setReconnecting6reasonySS_tF"></a>
                    <a name="//apple_ref/swift/Method/setReconnecting(reason:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP15setReconnecting6reasonySS_tF">setReconnecting(reason:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A12IOClientSpecP15setReconnecting6reasonySS_tF">setReconnecting(reason:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1794,8 +1668,8 @@ Called when the manager detects a broken connection, or when a manual reconnect
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Protocols/SocketLogger.html
+++ b/docs/Protocols/SocketLogger.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketLogger</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">protocol</span> <span class="kt">SocketLogger</span> <span class="p">:</span> <span class="kt">AnyObject</span></code></pre>

                </div>
@ -248,11 +203,9 @@
              <div class="task-name-container">
                <a name="/Properties"></a>
                <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
-</h3>
-                </div>
+                <a href="#/Properties">
+                  <h3 class="section-name">Properties</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -275,7 +228,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">log</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">log</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -288,11 +241,9 @@
              <div class="task-name-container">
                <a name="/Methods"></a>
                <a name="//apple_ref/swift/Section/Methods" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Methods"></a>
-                  <h3 class="section-name"><p>Methods</p>
-</h3>
-                </div>
+                <a href="#/Methods">
+                  <h3 class="section-name">Methods</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -300,7 +251,7 @@
                    <code>
                    <a name="/s:8SocketIO0A6LoggerP3log_4typeySSyXK_SStF"></a>
                    <a name="//apple_ref/swift/Method/log(_:type:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6LoggerP3log_4typeySSyXK_SStF">log(_:<wbr>type:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A6LoggerP3log_4typeySSyXK_SStF">log(_:type:)</a>
                    </code>
                      <span class="declaration-note">
                        Default implementation
@ -378,7 +329,7 @@
                    <code>
                    <a name="/s:8SocketIO0A6LoggerP5error_4typeySSyXK_SStF"></a>
                    <a name="//apple_ref/swift/Method/error(_:type:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A6LoggerP5error_4typeySSyXK_SStF">error(_:<wbr>type:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A6LoggerP5error_4typeySSyXK_SStF">error(_:type:)</a>
                    </code>
                      <span class="declaration-note">
                        Default implementation
@ -459,8 +410,8 @@
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Protocols/SocketManagerSpec.html
+++ b/docs/Protocols/SocketManagerSpec.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,12 +184,12 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketManagerSpec</h1>
              <div class="declaration">
                <div class="language">
-                  
-                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">protocol</span> <span class="kt">SocketManagerSpec</span> <span class="p">:</span> <span class="kt">AnyObject</span><span class="p">,</span> <span class="kt"><a href="../Protocols/SocketEngineClient.html">SocketEngineClient</a></span></code></pre>
+                  <pre class="highlight swift"><code><span class="kd">@objc</span>
+<span class="kd">public</span> <span class="kd">protocol</span> <span class="kt">SocketManagerSpec</span> <span class="p">:</span> <span class="kt">AnyObject</span><span class="p">,</span> <span class="kt"><a href="../Protocols/SocketEngineClient.html">SocketEngineClient</a></span></code></pre>

                </div>
              </div>
@ -242,7 +198,7 @@
 <p>A <code>SocketManagerSpec</code> is responsible for multiplexing multiple namespaces through a single <code><a href="../Protocols/SocketEngineSpec.html">SocketEngineSpec</a></code>.</p>

 <p>Example with <code><a href="../Classes/SocketManager.html">SocketManager</a></code>:</p>
-<pre class="highlight swift"><code><span class="k">let</span> <span class="nv">manager</span> <span class="o">=</span> <span class="kt">SocketManager</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="kt">URL</span><span class="p">(</span><span class="nv">string</span><span class="p">:</span><span class="s">"http://localhost:8080/"</span><span class="p">)</span><span class="o">!</span><span class="p">)</span>
+<pre class="highlight swift"><code><span class="k">let</span> <span class="nv">manager</span> <span class="o">=</span> <span class="nf">SocketManager</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="nf">URL</span><span class="p">(</span><span class="nv">string</span><span class="p">:</span><span class="s">"http://localhost:8080/"</span><span class="p">)</span><span class="o">!</span><span class="p">)</span>
 <span class="k">let</span> <span class="nv">defaultNamespaceSocket</span> <span class="o">=</span> <span class="n">manager</span><span class="o">.</span><span class="n">defaultSocket</span>
 <span class="k">let</span> <span class="nv">swiftSocket</span> <span class="o">=</span> <span class="n">manager</span><span class="o">.</span><span class="nf">socket</span><span class="p">(</span><span class="nv">forNamespace</span><span class="p">:</span> <span class="s">"/swift"</span><span class="p">)</span>

@ -252,7 +208,7 @@
 <p>Sockets created through the manager are retained by the manager. So at the very least, a single strong reference
 to the manager must be maintained to keep sockets alive.</p>

-<p>To disconnect a socket and remove it from the manager, either call <code><a href="../Classes/SocketIOClient.html#/s:8SocketIO0A8IOClientC10disconnectyyF">SocketIOClient.disconnect()</a></code> on the socket,
+<p>To disconnect a socket and remove it from the manager, either call <code><a href="../Classes/SocketIOClient.html#/c:@M@SocketIO@objc(cs)SocketIOClient(im)disconnect">SocketIOClient.disconnect()</a></code> on the socket,
 or call one of the <code>disconnectSocket</code> methods on this class.</p>

          </div>
@ -264,19 +220,17 @@ or call one of the <code>disconnectSocket</code> methods on this class.</p>
              <div class="task-name-container">
                <a name="/Properties"></a>
                <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
-</h3>
-                </div>
+                <a href="#/Properties">
+                  <h3 class="section-name">Properties</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP07defaultA0AA0A8IOClientCvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)defaultSocket"></a>
                    <a name="//apple_ref/swift/Property/defaultSocket" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP07defaultA0AA0A8IOClientCvp">defaultSocket</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)defaultSocket">defaultSocket</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -284,14 +238,14 @@ or call one of the <code>disconnectSocket</code> methods on this class.</p>
                    <section class="section">
                      <div class="pointer"></div>
                      <div class="abstract">
-                        <p>Returns the socket associated with the default namespace (&ldquo;/&rdquo;).</p>
+                        <p>Returns the socket associated with the default namespace (<q>/</q>).</p>

                      </div>
                      <div class="declaration">
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">defaultSocket</span><span class="p">:</span> <span class="kt"><a href="../Classes/SocketIOClient.html">SocketIOClient</a></span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">defaultSocket</span><span class="p">:</span> <span class="nf">SocketIOClient</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -301,9 +255,9 @@ or call one of the <code>disconnectSocket</code> methods on this class.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP6engineAA0a6EngineD0_pSgvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)engine"></a>
                    <a name="//apple_ref/swift/Property/engine" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP6engineAA0a6EngineD0_pSgvp">engine</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)engine">engine</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -318,7 +272,7 @@ or call one of the <code>disconnectSocket</code> methods on this class.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">engine</span><span class="p">:</span> <span class="kt"><a href="../Protocols/SocketEngineSpec.html">SocketEngineSpec</a></span><span class="p">?</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">engine</span><span class="p">:</span> <span class="nf">SocketEngineSpec</span><span class="p">?</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -328,9 +282,9 @@ or call one of the <code>disconnectSocket</code> methods on this class.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP8forceNewSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)forceNew"></a>
                    <a name="//apple_ref/swift/Property/forceNew" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP8forceNewSbvp">forceNew</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)forceNew">forceNew</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -345,7 +299,7 @@ or call one of the <code>disconnectSocket</code> methods on this class.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">forceNew</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">forceNew</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -355,9 +309,9 @@ or call one of the <code>disconnectSocket</code> methods on this class.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP11handleQueueSo17OS_dispatch_queueCvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)handleQueue"></a>
                    <a name="//apple_ref/swift/Property/handleQueue" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP11handleQueueSo17OS_dispatch_queueCvp">handleQueue</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)handleQueue">handleQueue</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -373,7 +327,7 @@ called on.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">handleQueue</span><span class="p">:</span> <span class="kt">DispatchQueue</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">handleQueue</span><span class="p">:</span> <span class="nf">DispatchQueue</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -383,9 +337,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP4nspsSDySSAA0A8IOClientCGvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)nsps"></a>
                    <a name="//apple_ref/swift/Property/nsps" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP4nspsSDySSAA0A8IOClientCGvp">nsps</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)nsps">nsps</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -410,9 +364,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP10reconnectsSbvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)reconnects"></a>
                    <a name="//apple_ref/swift/Property/reconnects" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP10reconnectsSbvp">reconnects</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)reconnects">reconnects</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -427,7 +381,7 @@ called on.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">reconnects</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">reconnects</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -437,9 +391,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP13reconnectWaitSivp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)reconnectWait"></a>
                    <a name="//apple_ref/swift/Property/reconnectWait" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP13reconnectWaitSivp">reconnectWait</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)reconnectWait">reconnectWait</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -454,7 +408,7 @@ called on.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">reconnectWait</span><span class="p">:</span> <span class="kt">Int</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">reconnectWait</span><span class="p">:</span> <span class="nf">Int</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -464,9 +418,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP16reconnectWaitMaxSivp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)reconnectWaitMax"></a>
                    <a name="//apple_ref/swift/Property/reconnectWaitMax" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP16reconnectWaitMaxSivp">reconnectWaitMax</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)reconnectWaitMax">reconnectWaitMax</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -481,7 +435,7 @@ called on.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">reconnectWaitMax</span><span class="p">:</span> <span class="kt">Int</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">reconnectWaitMax</span><span class="p">:</span> <span class="nf">Int</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -491,9 +445,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP19randomizationFactorSdvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)randomizationFactor"></a>
                    <a name="//apple_ref/swift/Property/randomizationFactor" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP19randomizationFactorSdvp">randomizationFactor</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)randomizationFactor">randomizationFactor</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -508,7 +462,7 @@ called on.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">randomizationFactor</span><span class="p">:</span> <span class="kt">Double</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">randomizationFactor</span><span class="p">:</span> <span class="nf">Double</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -518,9 +472,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP9socketURL10Foundation0F0Vvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)socketURL"></a>
                    <a name="//apple_ref/swift/Property/socketURL" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP9socketURL10Foundation0F0Vvp">socketURL</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)socketURL">socketURL</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -535,7 +489,7 @@ called on.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">socketURL</span><span class="p">:</span> <span class="kt">URL</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">socketURL</span><span class="p">:</span> <span class="nf">URL</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -545,9 +499,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP6statusAA0A8IOStatusOvp"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)status"></a>
                    <a name="//apple_ref/swift/Property/status" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP6statusAA0A8IOStatusOvp">status</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(py)status">status</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -562,34 +516,7 @@ called on.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">status</span><span class="p">:</span> <span class="kt"><a href="../Enums/SocketIOStatus.html">SocketIOStatus</a></span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
-
-                        </div>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP7versionAA0A9IOVersionOvp"></a>
-                    <a name="//apple_ref/swift/Property/version" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP7versionAA0A9IOVersionOvp">version</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        <p>The version of socket.io in use.</p>
-
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">version</span><span class="p">:</span> <span class="kt"><a href="../Enums/SocketIOVersion.html">SocketIOVersion</a></span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="k">var</span> <span class="nv">status</span><span class="p">:</span> <span class="nf">SocketIOStatus</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -602,19 +529,17 @@ called on.</p>
              <div class="task-name-container">
                <a name="/Methods"></a>
                <a name="//apple_ref/swift/Section/Methods" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Methods"></a>
-                  <h3 class="section-name"><p>Methods</p>
-</h3>
-                </div>
+                <a href="#/Methods">
+                  <h3 class="section-name">Methods</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP7connectyyF"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)connect"></a>
                    <a name="//apple_ref/swift/Method/connect()" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP7connectyyF">connect()</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)connect">connect()</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -639,9 +564,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP07connectA0_11withPayloadyAA0A8IOClientC_SDySSypGSgtF"></a>
-                    <a name="//apple_ref/swift/Method/connectSocket(_:withPayload:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP07connectA0_11withPayloadyAA0A8IOClientC_SDySSypGSgtF">connectSocket(_:<wbr>withPayload:<wbr>)</a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)connectSocket:"></a>
+                    <a name="//apple_ref/swift/Method/connectSocket(_:)" class="dashAnchor"></a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)connectSocket:">connectSocket(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -656,7 +581,7 @@ called on.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">func</span> <span class="nf">connectSocket</span><span class="p">(</span><span class="n">_</span> <span class="nv">socket</span><span class="p">:</span> <span class="kt"><a href="../Classes/SocketIOClient.html">SocketIOClient</a></span><span class="p">,</span> <span class="nv">withPayload</span><span class="p">:</span> <span class="p">[</span><span class="kt">String</span> <span class="p">:</span> <span class="kt">Any</span><span class="p">]?)</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">func</span> <span class="nf">connectSocket</span><span class="p">(</span><span class="n">_</span> <span class="nv">socket</span><span class="p">:</span> <span class="kt"><a href="../Classes/SocketIOClient.html">SocketIOClient</a></span><span class="p">)</span></code></pre>

                        </div>
                      </div>
@ -676,18 +601,6 @@ called on.</p>
                                </div>
                              </td>
                            </tr>
-                            <tr>
-                              <td>
-                                <code>
-                                <em>withPayload</em>
-                                </code>
-                              </td>
-                              <td>
-                                <div>
-                                  <p>Optional payload to send on connect</p>
-                                </div>
-                              </td>
-                            </tr>
                          </tbody>
                        </table>
                      </div>
@ -697,9 +610,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP13didDisconnect6reasonySS_tF"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)didDisconnectWithReason:"></a>
                    <a name="//apple_ref/swift/Method/didDisconnect(reason:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP13didDisconnect6reasonySS_tF">didDisconnect(reason:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)didDisconnectWithReason:">didDisconnect(reason:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -743,9 +656,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP10disconnectyyF"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)disconnect"></a>
                    <a name="//apple_ref/swift/Method/disconnect()" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP10disconnectyyF">disconnect()</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)disconnect">disconnect()</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -770,9 +683,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP010disconnectA0yyAA0A8IOClientCF"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)disconnectSocket:"></a>
                    <a name="//apple_ref/swift/Method/disconnectSocket(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP010disconnectA0yyAA0A8IOClientCF">disconnectSocket(_:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)disconnectSocket:">disconnectSocket(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -816,9 +729,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP010disconnectA012forNamespaceySS_tF"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)disconnectSocketForNamespace:"></a>
                    <a name="//apple_ref/swift/Method/disconnectSocket(forNamespace:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP010disconnectA012forNamespaceySS_tF">disconnectSocket(forNamespace:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)disconnectSocketForNamespace:">disconnectSocket(forNamespace:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -862,9 +775,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP7emitAllyySS_AA0A4Data_pdtF"></a>
-                    <a name="//apple_ref/swift/Method/emitAll(_:_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP7emitAllyySS_AA0A4Data_pdtF">emitAll(_:<wbr>_:<wbr>)</a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)emitAll:withItems:"></a>
+                    <a name="//apple_ref/swift/Method/emitAll(_:withItems:)" class="dashAnchor"></a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)emitAll:withItems:">emitAll(_:withItems:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -879,7 +792,7 @@ called on.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">func</span> <span class="nf">emitAll</span><span class="p">(</span><span class="n">_</span> <span class="nv">event</span><span class="p">:</span> <span class="kt">String</span><span class="p">,</span> <span class="n">_</span> <span class="nv">items</span><span class="p">:</span> <span class="kt"><a href="../Protocols/SocketData.html">SocketData</a></span><span class="o">...</span><span class="p">)</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">func</span> <span class="nf">emitAll</span><span class="p">(</span><span class="n">_</span> <span class="nv">event</span><span class="p">:</span> <span class="kt">String</span><span class="p">,</span> <span class="n">withItems</span> <span class="nv">items</span><span class="p">:</span> <span class="p">[</span><span class="kt">Any</span><span class="p">])</span></code></pre>

                        </div>
                      </div>
@ -920,9 +833,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP9reconnectyyF"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)reconnect"></a>
                    <a name="//apple_ref/swift/Method/reconnect()" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP9reconnectyyF">reconnect()</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)reconnect">reconnect()</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -949,9 +862,9 @@ called on.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP06removeA0yAA0A8IOClientCSgAFF"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)removeSocket:"></a>
                    <a name="//apple_ref/swift/Method/removeSocket(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP06removeA0yAA0A8IOClientCSgAFF">removeSocket(_:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)removeSocket:">removeSocket(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1001,9 +914,9 @@ After calling this method the socket should no longer be considered usable.</p>
                <li class="item">
                  <div>
                    <code>
-                    <a name="/s:8SocketIO0A11ManagerSpecP6socket12forNamespaceAA0A8IOClientCSS_tF"></a>
+                    <a name="/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)socketForNamespace:"></a>
                    <a name="//apple_ref/swift/Method/socket(forNamespace:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A11ManagerSpecP6socket12forNamespaceAA0A8IOClientCSS_tF">socket(forNamespace:<wbr>)</a>
+                    <a class="token" href="#/c:@M@SocketIO@objc(pl)SocketManagerSpec(im)socketForNamespace:">socket(forNamespace:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -1017,7 +930,7 @@ After calling this method the socket should no longer be considered usable.</p>

 <p>Sockets created from this method are retained by the manager.
 Call one of the <code>disconnectSocket</code> methods on the implementing class to remove the socket from manager control.
-Or call <code><a href="../Classes/SocketIOClient.html#/s:8SocketIO0A8IOClientC10disconnectyyF">SocketIOClient.disconnect()</a></code> on the client.</p>
+Or call <code><a href="../Classes/SocketIOClient.html#/c:@M@SocketIO@objc(cs)SocketIOClient(im)disconnect">SocketIOClient.disconnect()</a></code> on the client.</p>

                      </div>
                      <div class="declaration">
@ -1062,8 +975,8 @@ Or call <code><a href="../Classes/SocketIOClient.html#/s:8SocketIO0A8IOClientC10
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Protocols/SocketParsable.html
+++ b/docs/Protocols/SocketParsable.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketParsable</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">protocol</span> <span class="kt">SocketParsable</span> <span class="p">:</span> <span class="kt">AnyObject</span></code></pre>

                </div>
@ -248,11 +203,9 @@
              <div class="task-name-container">
                <a name="/Methods"></a>
                <a name="//apple_ref/swift/Section/Methods" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Methods"></a>
-                  <h3 class="section-name"><p>Methods</p>
-</h3>
-                </div>
+                <a href="#/Methods">
+                  <h3 class="section-name">Methods</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -260,8 +213,11 @@
                    <code>
                    <a name="/s:8SocketIO0A8ParsableP15parseBinaryDatayAA0A6PacketVSg10Foundation0F0VF"></a>
                    <a name="//apple_ref/swift/Method/parseBinaryData(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A8ParsableP15parseBinaryDatayAA0A6PacketVSg10Foundation0F0VF">parseBinaryData(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A8ParsableP15parseBinaryDatayAA0A6PacketVSg10Foundation0F0VF">parseBinaryData(_:)</a>
                    </code>
+                      <span class="declaration-note">
+                        Default implementation
+                      </span>
                  </div>
                  <div class="height-container">
                    <div class="pointer-container"></div>
@ -270,6 +226,15 @@
                      <div class="abstract">
                        <p>Called when the engine has received some binary data that should be attached to a packet.</p>

+<p>Packets binary data should be sent directly after the packet that expects it, so there&rsquo;s confusion over
+where the data should go. Data should be received in the order it is sent, so that the correct data is put
+into the correct placeholder.</p>
+
+                      </div>
+                      <h4>Default Implementation</h4>
+                      <div class="default_impl abstract">
+                        <p>Called when the engine has received some binary data that should be attached to a packet.</p>
+
 <p>Packets binary data should be sent directly after the packet that expects it, so there&rsquo;s confusion over
 where the data should go. Data should be received in the order it is sent, so that the correct data is put
 into the correct placeholder.</p>
@ -310,70 +275,7 @@ into the correct placeholder.</p>
                    <code>
                    <a name="/s:8SocketIO0A8ParsableP05parseA7MessageyAA0A6PacketVSgSSF"></a>
                    <a name="//apple_ref/swift/Method/parseSocketMessage(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A8ParsableP05parseA7MessageyAA0A6PacketVSgSSF">parseSocketMessage(_:<wbr>)</a>
-                    </code>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        <p>Called when the engine has received a string that should be parsed into a socket.io packet.</p>
-
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">func</span> <span class="nf">parseSocketMessage</span><span class="p">(</span><span class="n">_</span> <span class="nv">message</span><span class="p">:</span> <span class="kt">String</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kt"><a href="../Structs/SocketPacket.html">SocketPacket</a></span><span class="p">?</span></code></pre>
-
-                        </div>
-                      </div>
-                      <div>
-                        <h4>Parameters</h4>
-                        <table class="graybox">
-                          <tbody>
-                            <tr>
-                              <td>
-                                <code>
-                                <em>message</em>
-                                </code>
-                              </td>
-                              <td>
-                                <div>
-                                  <p>The string that needs parsing.</p>
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                      </div>
-                      <div>
-                        <h4>Return Value</h4>
-                        <p>A completed socket packet if there is no more data left to collect.</p>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-              </ul>
-            </div>
-            <div class="task-group">
-              <div class="task-name-container">
-                <a name="/Available%20where%20%60Self%60%3A%20%60SocketManagerSpec%60%20%26%20%60SocketDataBufferable%60"></a>
-                <a name="//apple_ref/swift/Section/Available where `Self`: `SocketManagerSpec` &amp; `SocketDataBufferable`" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Available%20where%20%60Self%60%3A%20%60SocketManagerSpec%60%20%26%20%60SocketDataBufferable%60"></a>
-                  <h3 class="section-name"><p>Available where <code>Self</code>: <code><a href="../Protocols/SocketManagerSpec.html">SocketManagerSpec</a></code> &amp; <code><a href="../Protocols/SocketDataBufferable.html">SocketDataBufferable</a></code></p>
-</h3>
-                </div>
-              </div>
-              <ul class="item-container">
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:8SocketIO0A8ParsablePA2A0A14DataBufferableRzAA0A11ManagerSpecRzrlE05parseA7MessageyAA0A6PacketVSgSSF"></a>
-                    <a name="//apple_ref/swift/Method/parseSocketMessage(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A8ParsablePA2A0A14DataBufferableRzAA0A11ManagerSpecRzrlE05parseA7MessageyAA0A6PacketVSgSSF">parseSocketMessage(_:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A8ParsableP05parseA7MessageyAA0A6PacketVSgSSF">parseSocketMessage(_:)</a>
                    </code>
                      <span class="declaration-note">
                        Default implementation
@ -384,7 +286,8 @@ into the correct placeholder.</p>
                    <section class="section">
                      <div class="pointer"></div>
                      <div class="abstract">
-                        
+                        <p>Called when the engine has received a string that should be parsed into a socket.io packet.</p>
+
                      </div>
                      <h4>Default Implementation</h4>
                      <div class="default_impl abstract">
@ -418,67 +321,6 @@ into the correct placeholder.</p>
                          </tbody>
                        </table>
                      </div>
-                      <div>
-                        <h4>Return Value</h4>
-                        <p>A completed socket packet or nil if the packet is invalid.</p>
-                      </div>
-                    </section>
-                  </div>
-                </li>
-                <li class="item">
-                  <div>
-                    <code>
-                    <a name="/s:8SocketIO0A8ParsablePA2A0A14DataBufferableRzAA0A11ManagerSpecRzrlE011parseBinaryD0yAA0A6PacketVSg10Foundation0D0VF"></a>
-                    <a name="//apple_ref/swift/Method/parseBinaryData(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A8ParsablePA2A0A14DataBufferableRzAA0A11ManagerSpecRzrlE011parseBinaryD0yAA0A6PacketVSg10Foundation0D0VF">parseBinaryData(_:<wbr>)</a>
-                    </code>
-                      <span class="declaration-note">
-                        Default implementation
-                      </span>
-                  </div>
-                  <div class="height-container">
-                    <div class="pointer-container"></div>
-                    <section class="section">
-                      <div class="pointer"></div>
-                      <div class="abstract">
-                        
-                      </div>
-                      <h4>Default Implementation</h4>
-                      <div class="default_impl abstract">
-                        <p>Called when the engine has received some binary data that should be attached to a packet.</p>
-
-<p>Packets binary data should be sent directly after the packet that expects it, so there&rsquo;s confusion over
-where the data should go. Data should be received in the order it is sent, so that the correct data is put
-into the correct placeholder.</p>
-
-                      </div>
-                      <div class="declaration">
-                        <h4>Declaration</h4>
-                        <div class="language">
-                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">func</span> <span class="nf">parseBinaryData</span><span class="p">(</span><span class="n">_</span> <span class="nv">data</span><span class="p">:</span> <span class="kt">Data</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kt"><a href="../Structs/SocketPacket.html">SocketPacket</a></span><span class="p">?</span></code></pre>
-
-                        </div>
-                      </div>
-                      <div>
-                        <h4>Parameters</h4>
-                        <table class="graybox">
-                          <tbody>
-                            <tr>
-                              <td>
-                                <code>
-                                <em>data</em>
-                                </code>
-                              </td>
-                              <td>
-                                <div>
-                                  <p>The data that should be attached to a packet.</p>
-                                </div>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                      </div>
                      <div>
                        <h4>Return Value</h4>
                        <p>A completed socket packet if there is no more data left to collect.</p>
@ -494,8 +336,8 @@ into the correct placeholder.</p>
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Structs.html
+++ b/docs/Structs.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,7 +184,7 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>Structures</h1>
            <p>The following structures are available globally.</p>

@ -267,6 +223,10 @@
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
@ -295,6 +255,10 @@
                    </section>
                  </div>
                </li>
+              </ul>
+            </div>
+            <div class="task-group">
+              <ul class="item-container">
                <li class="item">
                  <div>
                    <code>
@ -331,8 +295,8 @@
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Structs/SocketEventHandler.html
+++ b/docs/Structs/SocketEventHandler.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketEventHandler</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">struct</span> <span class="kt">SocketEventHandler</span></code></pre>

                </div>
@ -248,11 +203,9 @@
              <div class="task-name-container">
                <a name="/Properties"></a>
                <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
-</h3>
-                </div>
+                <a href="#/Properties">
+                  <h3 class="section-name">Properties</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -342,11 +295,9 @@
              <div class="task-name-container">
                <a name="/Methods"></a>
                <a name="//apple_ref/swift/Section/Methods" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Methods"></a>
-                  <h3 class="section-name"><p>Methods</p>
-</h3>
-                </div>
+                <a href="#/Methods">
+                  <h3 class="section-name">Methods</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -354,7 +305,7 @@
                    <code>
                    <a name="/s:8SocketIO0A12EventHandlerV15executeCallback4with0G3Ack0gA0ySayypG_SiAA0A8IOClientCtF"></a>
                    <a name="//apple_ref/swift/Method/executeCallback(with:withAck:withSocket:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A12EventHandlerV15executeCallback4with0G3Ack0gA0ySayypG_SiAA0A8IOClientCtF">executeCallback(with:<wbr>withAck:<wbr>withSocket:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A12EventHandlerV15executeCallback4with0G3Ack0gA0ySayypG_SiAA0A8IOClientCtF">executeCallback(with:withAck:withSocket:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -427,8 +378,8 @@
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Structs/SocketIOClientConfiguration.html
+++ b/docs/Structs/SocketIOClientConfiguration.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketIOClientConfiguration</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">struct</span> <span class="kt">SocketIOClientConfiguration</span> <span class="p">:</span> <span class="kt">ExpressibleByArrayLiteral</span><span class="p">,</span> <span class="kt">Collection</span><span class="p">,</span> <span class="kt">MutableCollection</span></code></pre>

                </div>
@ -248,11 +203,9 @@
              <div class="task-name-container">
                <a name="/Typealiases"></a>
                <a name="//apple_ref/swift/Section/Typealiases" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Typealiases"></a>
-                  <h3 class="section-name"><p>Typealiases</p>
-</h3>
-                </div>
+                <a href="#/Typealiases">
+                  <h3 class="section-name">Typealiases</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -369,11 +322,9 @@
              <div class="task-name-container">
                <a name="/Properties"></a>
                <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
-</h3>
-                </div>
+                <a href="#/Properties">
+                  <h3 class="section-name">Properties</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -396,7 +347,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">startIndex</span><span class="p">:</span> <span class="kt"><a href="../Structs/SocketIOClientConfiguration.html#/s:8SocketIO0A21IOClientConfigurationV5Indexa">Index</a></span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">startIndex</span><span class="p">:</span> <span class="nf">Index</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -423,7 +374,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">endIndex</span><span class="p">:</span> <span class="kt"><a href="../Structs/SocketIOClientConfiguration.html#/s:8SocketIO0A21IOClientConfigurationV5Indexa">Index</a></span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">endIndex</span><span class="p">:</span> <span class="nf">Index</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -450,7 +401,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">isEmpty</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">isEmpty</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -477,7 +428,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">count</span><span class="p">:</span> <span class="kt"><a href="../Structs/SocketIOClientConfiguration.html#/s:8SocketIO0A21IOClientConfigurationV5Indexa">Index</a></span><span class="o">.</span><span class="kt">Stride</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">count</span><span class="p">:</span> <span class="kt"><a href="../Structs/SocketIOClientConfiguration.html#/s:8SocketIO0A21IOClientConfigurationV5Indexa">Index</a></span><span class="o">.</span><span class="nf">Stride</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -504,7 +455,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">first</span><span class="p">:</span> <span class="kt"><a href="../Structs/SocketIOClientConfiguration.html#/s:8SocketIO0A21IOClientConfigurationV7Elementa">Element</a></span><span class="p">?</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">first</span><span class="p">:</span> <span class="nf">Element</span><span class="p">?</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -516,7 +467,7 @@
                    <code>
                    <a name="/s:Sly7ElementQz5IndexQzcip"></a>
                    <a name="//apple_ref/swift/Method/subscript(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:Sly7ElementQz5IndexQzcip">subscript(_:<wbr>)</a>
+                    <a class="token" href="#/s:Sly7ElementQz5IndexQzcip">subscript(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -530,7 +481,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="nf">subscript</span><span class="p">(</span><span class="nv">position</span><span class="p">:</span> <span class="kt"><a href="../Structs/SocketIOClientConfiguration.html#/s:8SocketIO0A21IOClientConfigurationV5Indexa">Index</a></span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kt"><a href="../Structs/SocketIOClientConfiguration.html#/s:8SocketIO0A21IOClientConfigurationV7Elementa">Element</a></span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="nf">subscript</span><span class="p">(</span><span class="nv">position</span><span class="p">:</span> <span class="kt"><a href="../Structs/SocketIOClientConfiguration.html#/s:8SocketIO0A21IOClientConfigurationV5Indexa">Index</a></span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nf">Element</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -542,7 +493,7 @@
                    <code>
                    <a name="/s:Sly11SubSequenceQzSny5IndexQzGcip"></a>
                    <a name="//apple_ref/swift/Method/subscript(_:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:Sly11SubSequenceQzSny5IndexQzGcip">subscript(_:<wbr>)</a>
+                    <a class="token" href="#/s:Sly11SubSequenceQzSny5IndexQzGcip">subscript(_:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -556,7 +507,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="nf">subscript</span><span class="p">(</span><span class="nv">bounds</span><span class="p">:</span> <span class="kt">Range</span><span class="o">&lt;</span><span class="kt"><a href="../Structs/SocketIOClientConfiguration.html#/s:8SocketIO0A21IOClientConfigurationV5Indexa">Index</a></span><span class="o">&gt;</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kt"><a href="../Structs/SocketIOClientConfiguration.html#/s:8SocketIO0A21IOClientConfigurationV11SubSequencea">SubSequence</a></span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="nf">subscript</span><span class="p">(</span><span class="nv">bounds</span><span class="p">:</span> <span class="kt">Range</span><span class="o">&lt;</span><span class="kt"><a href="../Structs/SocketIOClientConfiguration.html#/s:8SocketIO0A21IOClientConfigurationV5Indexa">Index</a></span><span class="o">&gt;</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nf">SubSequence</span> <span class="p">{</span> <span class="k">get</span> <span class="k">set</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -569,11 +520,9 @@
              <div class="task-name-container">
                <a name="/Initializers"></a>
                <a name="//apple_ref/swift/Section/Initializers" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Initializers"></a>
-                  <h3 class="section-name"><p>Initializers</p>
-</h3>
-                </div>
+                <a href="#/Initializers">
+                  <h3 class="section-name">Initializers</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -581,7 +530,7 @@
                    <code>
                    <a name="/s:8SocketIO0A21IOClientConfigurationV12arrayLiteralAcA0aC6OptionOd_tcfc"></a>
                    <a name="//apple_ref/swift/Method/init(arrayLiteral:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A21IOClientConfigurationV12arrayLiteralAcA0aC6OptionOd_tcfc">init(arrayLiteral:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A21IOClientConfigurationV12arrayLiteralAcA0aC6OptionOd_tcfc">init(arrayLiteral:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -628,11 +577,9 @@
              <div class="task-name-container">
                <a name="/Methods"></a>
                <a name="//apple_ref/swift/Section/Methods" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Methods"></a>
-                  <h3 class="section-name"><p>Methods</p>
-</h3>
-                </div>
+                <a href="#/Methods">
+                  <h3 class="section-name">Methods</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -671,7 +618,7 @@
                    <code>
                    <a name="/s:8SocketIO0A21IOClientConfigurationV5index5afterS2i_tF"></a>
                    <a name="//apple_ref/swift/Method/index(after:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A21IOClientConfigurationV5index5afterS2i_tF">index(after:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A21IOClientConfigurationV5index5afterS2i_tF">index(after:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -701,7 +648,7 @@
                    <code>
                    <a name="/s:8SocketIO0A21IOClientConfigurationV6insert_9replacingyAA0aC6OptionO_SbtF"></a>
                    <a name="//apple_ref/swift/Method/insert(_:replacing:)" class="dashAnchor"></a>
-                    <a class="token" href="#/s:8SocketIO0A21IOClientConfigurationV6insert_9replacingyAA0aC6OptionO_SbtF">insert(_:<wbr>replacing:<wbr>)</a>
+                    <a class="token" href="#/s:8SocketIO0A21IOClientConfigurationV6insert_9replacingyAA0aC6OptionO_SbtF">insert(_:replacing:)</a>
                    </code>
                  </div>
                  <div class="height-container">
@ -762,8 +709,8 @@
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Structs/SocketPacket.html
+++ b/docs/Structs/SocketPacket.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>SocketPacket</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">struct</span> <span class="kt">SocketPacket</span> <span class="p">:</span> <span class="kt">CustomStringConvertible</span></code></pre>

                </div>
@ -248,11 +203,9 @@
              <div class="task-name-container">
                <a name="/Properties"></a>
                <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
-</h3>
-                </div>
+                <a href="#/Properties">
+                  <h3 class="section-name">Properties</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -356,7 +309,9 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">internal(set)</span> <span class="k">var</span> <span class="nv">binary</span><span class="p">:</span> <span class="p">[</span><span class="kt">Data</span><span class="p">]</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">internal(set)</span> <span class="k">var</span> <span class="nv">binary</span><span class="p">:</span> <span class="p">[</span><span class="kt">Data</span><span class="p">]</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -386,7 +341,9 @@ event type packets.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">internal(set)</span> <span class="k">var</span> <span class="nv">data</span><span class="p">:</span> <span class="p">[</span><span class="kt">Any</span><span class="p">]</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="kd">internal(set)</span> <span class="k">var</span> <span class="nv">data</span><span class="p">:</span> <span class="p">[</span><span class="kt">Any</span><span class="p">]</span> <span class="p">{</span>
+  <span class="k">get</span>
+  <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -440,7 +397,7 @@ event type packets.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">description</span><span class="p">:</span> <span class="kt">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">description</span><span class="p">:</span> <span class="nf">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -467,7 +424,7 @@ event type packets.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">event</span><span class="p">:</span> <span class="kt">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">event</span><span class="p">:</span> <span class="nf">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -494,7 +451,7 @@ event type packets.</p>
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">packetString</span><span class="p">:</span> <span class="kt">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">packetString</span><span class="p">:</span> <span class="nf">String</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -507,11 +464,9 @@ event type packets.</p>
              <div class="task-name-container">
                <a name="/PacketType%20enum"></a>
                <a name="//apple_ref/swift/Section/PacketType enum" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/PacketType%20enum"></a>
-                  <h3 class="section-name"><p>PacketType enum</p>
-</h3>
-                </div>
+                <a href="#/PacketType%20enum">
+                  <h3 class="section-name">PacketType enum</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -550,8 +505,8 @@ event type packets.</p>
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Structs/SocketPacket/PacketType.html
+++ b/docs/Structs/SocketPacket/PacketType.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="../../index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../../12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../../15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../../faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../../Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="../../Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../../Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../../Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../../Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="../../Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="../../Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../../Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../../Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../../Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../../Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../../Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../../Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../../Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../../Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../../Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../../Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../../Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="../../Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="../../Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,11 +184,10 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>PacketType</h1>
              <div class="declaration">
                <div class="language">
-                  
                  <pre class="highlight swift"><code><span class="kd">enum</span> <span class="kt">PacketType</span> <span class="p">:</span> <span class="kt">Int</span></code></pre>

                </div>
@ -248,11 +203,9 @@
              <div class="task-name-container">
                <a name="/Cases"></a>
                <a name="//apple_ref/swift/Section/Cases" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Cases"></a>
-                  <h3 class="section-name"><p>Cases</p>
-</h3>
-                </div>
+                <a href="#/Cases">
+                  <h3 class="section-name">Cases</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -450,11 +403,9 @@
              <div class="task-name-container">
                <a name="/Properties"></a>
                <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
-                <div class="section-name-container">
-                  <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
-</h3>
-                </div>
+                <a href="#/Properties">
+                  <h3 class="section-name">Properties</h3>
+                </a>
              </div>
              <ul class="item-container">
                <li class="item">
@ -477,7 +428,7 @@
                        <h4>Declaration</h4>
                        <div class="language">
                          <p class="aside-title">Swift</p>
-                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">isBinary</span><span class="p">:</span> <span class="kt">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>
+                          <pre class="highlight swift"><code><span class="kd">public</span> <span class="k">var</span> <span class="nv">isBinary</span><span class="p">:</span> <span class="nf">Bool</span> <span class="p">{</span> <span class="k">get</span> <span class="p">}</span></code></pre>

                        </div>
                      </div>
@ -492,8 +443,8 @@
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/Typealiases.html
+++ b/docs/Typealiases.html
@ -21,7 +21,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -50,9 +50,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="faq.html">FAQ</a>
              </li>
@ -64,6 +61,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -105,55 +105,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -228,7 +184,7 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            <h1>Type Aliases</h1>
            <p>The following type aliases are available globally.</p>

@ -328,8 +284,8 @@
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/css/jazzy.css
+++ b/docs/css/jazzy.css
@ -63,10 +63,6 @@ a {
  a:hover, a:focus {
    outline: 0;
    text-decoration: underline; }
-  a.discouraged {
-    text-decoration: line-through; }
-    a.discouraged:hover, a.discouraged:focus {
-      text-decoration: underline line-through; }

 table {
  background: #fff;
@ -94,10 +90,10 @@ pre {
 code {
  font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace; }

-.item-container p > code, .item-container li > code, .top-matter p > code, .top-matter li > code {
+p > code, li > code {
  background: #f7f7f7;
  padding: .2em; }
-  .item-container p > code:before, .item-container p > code:after, .item-container li > code:before, .item-container li > code:after, .top-matter p > code:before, .top-matter p > code:after, .top-matter li > code:before, .top-matter li > code:after {
+  p > code:before, p > code:after, li > code:before, li > code:after {
    letter-spacing: -.2em;
    content: "\00a0"; }

@ -111,6 +107,7 @@ pre code {
  @media (min-width: 768px) {
    .content-wrapper {
      flex-direction: row; } }
+
 .header {
  display: flex;
  padding: 8px;
@ -156,6 +153,7 @@ pre code {
      word-wrap: normal;
      background: #fbfbfb;
      border-right: 1px solid #ddd; } }
+
 .nav-groups {
  list-style-type: none;
  padding-left: 0; }
@ -186,6 +184,7 @@ pre code {
      order: 2;
      flex: 1;
      padding-bottom: 60px; } }
+
 .section {
  padding: 0 32px;
  border-bottom: 1px solid #ddd; }
@ -198,8 +197,6 @@ pre code {
 .section-name {
  color: #666;
  display: block; }
-  .section-name p {
-    margin-bottom: inherit; }

 .declaration .highlight {
  overflow-x: initial;
@ -218,22 +215,6 @@ pre code {
  content: "";
  display: block; }

-.section-name-container {
-  position: relative; }
-  .section-name-container .section-name-link {
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    margin-bottom: 0; }
-  .section-name-container .section-name {
-    position: relative;
-    pointer-events: none;
-    z-index: 1; }
-    .section-name-container .section-name a {
-      pointer-events: auto; }
-
 .item-container {
  padding: 0; }

@ -244,11 +225,9 @@ pre code {
  .item a[name]:before {
    content: "";
    display: block; }
-  .item .token, .item .direct-link {
-    display: inline-block;
-    text-indent: -20px;
+  .item .token {
    padding-left: 3px;
-    margin-left: 20px;
+    margin-left: 0px;
    font-size: 1rem; }
  .item .declaration-note {
    font-size: .85em;
@ -308,9 +287,9 @@ pre code {
  .language .aside-title {
    color: #4183c4; }

-.aside-warning, .aside-deprecated, .aside-unavailable {
+.aside-warning {
  border-left: 5px solid #ff6666; }
-  .aside-warning .aside-title, .aside-deprecated .aside-title, .aside-unavailable .aside-title {
+  .aside-warning .aside-title {
    color: #ff0000; }

 .graybox {
@ -346,7 +325,6 @@ pre code {

 html.dash .header, html.dash .breadcrumbs, html.dash .navigation {
  display: none; }
-
 html.dash .height-container {
  display: block; }

@ -360,17 +338,14 @@ form[role=search] input {
  border-radius: 1em; }
  .loading form[role=search] input {
    background: white url(../img/spinner.gif) center right 4px no-repeat; }
-
 form[role=search] .tt-menu {
  margin: 0;
  min-width: 300px;
  background: #fbfbfb;
  color: #333;
  border: 1px solid #ddd; }
-
 form[role=search] .tt-highlight {
  font-weight: bold; }
-
 form[role=search] .tt-suggestion {
  font: 16px/1.7 "Helvetica Neue", Helvetica, Arial, sans-serif;
  padding: 0 8px; }
@ -383,13 +358,11 @@ form[role=search] .tt-suggestion {
    font-weight: normal;
    font-size: 0.9em;
    padding-left: 16px; }
-
 form[role=search] .tt-suggestion:hover,
 form[role=search] .tt-suggestion.tt-cursor {
  cursor: pointer;
  background-color: #4183c4;
  color: #fff; }
-
 form[role=search] .tt-suggestion:hover .doc-parent-name,
 form[role=search] .tt-suggestion.tt-cursor .doc-parent-name {
  color: #fff; }
--- a/docs/faq.html
+++ b/docs/faq.html
@ -20,7 +20,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -49,9 +49,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="faq.html">FAQ</a>
              </li>
@ -63,6 +60,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -104,55 +104,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -227,7 +183,7 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            
            <h2 id='how-do-i-connect-to-my-websocket-server' class='heading'>How do I connect to my WebSocket server?</h2>

@ -241,9 +197,9 @@ for Objective-C.</p>
 <a href="https://developer.apple.com/library/content/documentation/Swift/Conceptual/Swift_Programming_Language/AutomaticReferenceCounting.html">ARC</a>.</p>

 <p>Take this code for example:</p>
-<pre class="highlight swift"><code><span class="kd">class</span> <span class="kt">Manager</span> <span class="p">{</span>
+<pre class="highlight swift"><code><span class="kd">class</span> <span class="nf">Manager</span> <span class="p">{</span>
    <span class="kd">func</span> <span class="nf">addHandlers</span><span class="p">()</span> <span class="p">{</span>
-        <span class="k">let</span> <span class="nv">manager</span> <span class="o">=</span> <span class="kt">SocketManager</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="kt">URL</span><span class="p">(</span><span class="nv">string</span><span class="p">:</span> <span class="s">"http://somesocketioserver.com"</span><span class="p">)</span><span class="o">!</span><span class="p">)</span>
+        <span class="k">let</span> <span class="nv">manager</span> <span class="o">=</span> <span class="nf">SocketManager</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="nf">URL</span><span class="p">(</span><span class="nv">string</span><span class="p">:</span> <span class="s">"http://somesocketioserver.com"</span><span class="p">)</span><span class="o">!</span><span class="p">)</span>

        <span class="n">manager</span><span class="o">.</span><span class="n">defaultSocket</span><span class="o">.</span><span class="nf">on</span><span class="p">(</span><span class="s">"myEvent"</span><span class="p">)</span> <span class="p">{</span><span class="n">data</span><span class="p">,</span> <span class="n">ack</span> <span class="k">in</span>
            <span class="nf">print</span><span class="p">(</span><span class="n">data</span><span class="p">)</span>
@ -257,8 +213,8 @@ for Objective-C.</p>
 will be released, along with the socket, and its memory reclaimed.</p>

 <p>A correct way would be:</p>
-<pre class="highlight swift"><code><span class="kd">class</span> <span class="kt">Manager</span> <span class="p">{</span>
-    <span class="k">let</span> <span class="nv">manager</span> <span class="o">=</span> <span class="kt">SocketManager</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="kt">URL</span><span class="p">(</span><span class="nv">string</span><span class="p">:</span> <span class="s">"http://somesocketioserver.com"</span><span class="p">)</span><span class="o">!</span><span class="p">)</span>
+<pre class="highlight swift"><code><span class="kd">class</span> <span class="nf">Manager</span> <span class="p">{</span>
+    <span class="k">let</span> <span class="nv">manager</span> <span class="o">=</span> <span class="nf">SocketManager</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="nf">URL</span><span class="p">(</span><span class="nv">string</span><span class="p">:</span> <span class="s">"http://somesocketioserver.com"</span><span class="p">)</span><span class="o">!</span><span class="p">)</span>

    <span class="kd">func</span> <span class="nf">addHandlers</span><span class="p">()</span> <span class="p">{</span>
        <span class="n">manager</span><span class="o">.</span><span class="n">defaultSocket</span><span class="o">.</span><span class="nf">on</span><span class="p">(</span><span class="s">"myEvent"</span><span class="p">)</span> <span class="p">{</span><span class="n">data</span><span class="p">,</span> <span class="n">ack</span> <span class="k">in</span>
@ -276,8 +232,8 @@ will be released, along with the socket, and its memory reclaimed.</p>
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/index.html
+++ b/docs/index.html
@ -20,7 +20,7 @@
    <header class="header">
      <p class="header-col header-col--primary">
        <a class="header-link" href="index.html">
-          SocketIO 16.0.0 Docs
+          SocketIO Docs
        </a>
         (100% documented)
      </p>
@ -49,9 +49,6 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="12to13.html">12to13</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="15to16.html">15to16</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="faq.html">FAQ</a>
              </li>
@ -63,6 +60,9 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Classes/OnAckCallback.html">OnAckCallback</a>
              </li>
+              <li class="nav-group-task">
+                <a class="nav-group-task-link" href="Classes/SSLSecurity.html">SSLSecurity</a>
+              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Classes/SocketAckEmitter.html">SocketAckEmitter</a>
              </li>
@ -104,55 +104,11 @@
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Enums/SocketIOStatus.html">SocketIOStatus</a>
              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Enums/SocketIOVersion.html">SocketIOVersion</a>
-              </li>
              <li class="nav-group-task">
                <a class="nav-group-task-link" href="Enums/SocketParsableError.html">SocketParsableError</a>
              </li>
            </ul>
          </li>
-          <li class="nav-group-name">
-            <a class="nav-group-name-link" href="Extensions.html">Extensions</a>
-            <ul class="nav-group-tasks">
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sa">Array</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sb">Bool</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:10Foundation4DataV">Data</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SD">Dictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Sd">Double</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:Si">Int</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSArray">NSArray</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSData">NSData</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSDictionary">NSDictionary</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSNull">NSNull</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/c:objc(cs)NSString">NSString</a>
-              </li>
-              <li class="nav-group-task">
-                <a class="nav-group-task-link" href="Extensions.html#/s:SS">String</a>
-              </li>
-            </ul>
-          </li>
          <li class="nav-group-name">
            <a class="nav-group-name-link" href="Protocols.html">Protocols</a>
            <ul class="nav-group-tasks">
@ -227,7 +183,7 @@
      <article class="main-content">

        <section class="section">
-          <div class="section-content top-matter">
+          <div class="section-content">
            
            <p><a href="https://travis-ci.org/socketio/socket.io-client-swift"><img src="https://travis-ci.org/socketio/socket.io-client-swift.svg?branch=master" alt="Build Status"></a></p>
 <h1 id='socket-io-client-swift' class='heading'>Socket.IO-Client-Swift</h1>
@ -236,7 +192,7 @@
 <h2 id='example' class='heading'>Example</h2>
 <pre class="highlight swift"><code><span class="kd">import</span> <span class="kt">SocketIO</span>

-<span class="k">let</span> <span class="nv">manager</span> <span class="o">=</span> <span class="kt">SocketManager</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="kt">URL</span><span class="p">(</span><span class="nv">string</span><span class="p">:</span> <span class="s">"http://localhost:8080"</span><span class="p">)</span><span class="o">!</span><span class="p">,</span> <span class="nv">config</span><span class="p">:</span> <span class="p">[</span><span class="o">.</span><span class="nf">log</span><span class="p">(</span><span class="kc">true</span><span class="p">),</span> <span class="o">.</span><span class="n">compress</span><span class="p">])</span>
+<span class="k">let</span> <span class="nv">manager</span> <span class="o">=</span> <span class="nf">SocketManager</span><span class="p">(</span><span class="nv">socketURL</span><span class="p">:</span> <span class="nf">URL</span><span class="p">(</span><span class="nv">string</span><span class="p">:</span> <span class="s">"http://localhost:8080"</span><span class="p">)</span><span class="o">!</span><span class="p">,</span> <span class="nv">config</span><span class="p">:</span> <span class="p">[</span><span class="o">.</span><span class="nf">log</span><span class="p">(</span><span class="kc">true</span><span class="p">),</span> <span class="o">.</span><span class="n">compress</span><span class="p">])</span>
 <span class="k">let</span> <span class="nv">socket</span> <span class="o">=</span> <span class="n">manager</span><span class="o">.</span><span class="n">defaultSocket</span>

 <span class="n">socket</span><span class="o">.</span><span class="nf">on</span><span class="p">(</span><span class="nv">clientEvent</span><span class="p">:</span> <span class="o">.</span><span class="n">connect</span><span class="p">)</span> <span class="p">{</span><span class="n">data</span><span class="p">,</span> <span class="n">ack</span> <span class="k">in</span>
@ -244,13 +200,9 @@
 <span class="p">}</span>

 <span class="n">socket</span><span class="o">.</span><span class="nf">on</span><span class="p">(</span><span class="s">"currentAmount"</span><span class="p">)</span> <span class="p">{</span><span class="n">data</span><span class="p">,</span> <span class="n">ack</span> <span class="k">in</span>
-    <span class="k">guard</span> <span class="k">let</span> <span class="nv">cur</span> <span class="o">=</span> <span class="n">data</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="k">as?</span> <span class="kt">Double</span> <span class="k">else</span> <span class="p">{</span> <span class="k">return</span> <span class="p">}</span>
+    <span class="k">guard</span> <span class="k">let</span> <span class="nv">cur</span> <span class="o">=</span> <span class="n">data</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="k">as?</span> <span class="kt">Double</span> <span class="nf">else</span> <span class="p">{</span> <span class="k">return</span> <span class="p">}</span>

    <span class="n">socket</span><span class="o">.</span><span class="nf">emitWithAck</span><span class="p">(</span><span class="s">"canUpdate"</span><span class="p">,</span> <span class="n">cur</span><span class="p">)</span><span class="o">.</span><span class="nf">timingOut</span><span class="p">(</span><span class="nv">after</span><span class="p">:</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span><span class="n">data</span> <span class="k">in</span>
-        <span class="k">if</span> <span class="n">data</span><span class="o">.</span><span class="n">first</span> <span class="k">as?</span> <span class="kt">String</span> <span class="p">??</span> <span class="s">"passed"</span> <span class="o">==</span> <span class="kt">SocketAckValue</span><span class="o">.</span><span class="n">noAck</span> <span class="p">{</span>
-            <span class="c1">// Handle ack timeout </span>
-        <span class="p">}</span>
-
        <span class="n">socket</span><span class="o">.</span><span class="nf">emit</span><span class="p">(</span><span class="s">"update"</span><span class="p">,</span> <span class="p">[</span><span class="s">"amount"</span><span class="p">:</span> <span class="n">cur</span> <span class="o">+</span> <span class="mf">2.50</span><span class="p">])</span>
    <span class="p">}</span>

@ -258,25 +210,52 @@
 <span class="p">}</span>

 <span class="n">socket</span><span class="o">.</span><span class="nf">connect</span><span class="p">()</span>
+</code></pre>
+<h2 id='objective-c-example' class='heading'>Objective-C Example</h2>
+<pre class="highlight plaintext"><code>@import SocketIO;
+
+NSURL* url = [[NSURL alloc] initWithString:@"http://localhost:8080"];
+SocketManager* manager = [[SocketManager alloc] initWithSocketURL:url config:@{@"log": @YES, @"compress": @YES}];
+SocketIOClient* socket = manager.defaultSocket;
+
+[socket on:@"connect" callback:^(NSArray* data, SocketAckEmitter* ack) {
+    NSLog(@"socket connected");
+}];
+
+[socket on:@"currentAmount" callback:^(NSArray* data, SocketAckEmitter* ack) {
+    double cur = [[data objectAtIndex:0] floatValue];
+
+    [[socket emitWithAck:@"canUpdate" with:@[@(cur)]] timingOutAfter:0 callback:^(NSArray* data) {
+        [socket emit:@"update" with:@[@{@"amount": @(cur + 2.50)}]];
+    }];
+
+    [ack with:@[@"Got your currentAmount, ", @"dude"]];
+}];
+
+[socket connect];
+
 </code></pre>
 <h2 id='features' class='heading'>Features</h2>

 <ul>
-<li>Supports socket.io 2.0+/3.0+.</li>
-<li>Supports Binary</li>
+<li>Supports socket.io 2.0+ (For socket.io 1.0 use v9.x)</li>
+<li>Supports binary</li>
 <li>Supports Polling and WebSockets</li>
 <li>Supports TLS/SSL</li>
+<li>Can be used from Objective-C</li>
 </ul>
 <h2 id='faqs' class='heading'>FAQS</h2>

 <p>Checkout the <a href="https://nuclearace.github.io/Socket.IO-Client-Swift/faq.html">FAQs</a> for commonly asked questions.</p>

 <p>Checkout the <a href="https://nuclearace.github.io/Socket.IO-Client-Swift/12to13.html">12to13</a> guide for migrating to v13+ from v12 below.</p>
-
-<p>Checkout the <a href="https://nuclearace.github.io/Socket.IO-Client-Swift/15to16.html">15to16</a> guide for migrating to v16+ from v15.</p>
 <h2 id='installation' class='heading'>Installation</h2>

 <p>Requires Swift 4/5 and Xcode 10.x</p>
+
+<p>If you need Swift 2.3 use the <a href="https://github.com/socketio/socket.io-client-swift/releases/tag/swift2.3">swift2.3 tag</a> (Pre-Swift 4 support is no longer maintained)</p>
+
+<p>If you need Swift 3.x use v11.1.3.</p>
 <h3 id='swift-package-manager' class='heading'>Swift Package Manager</h3>

 <p>Add the project as a dependency to your Package.swift:</p>
@ -284,7 +263,7 @@

 <span class="kd">import</span> <span class="kt">PackageDescription</span>

-<span class="k">let</span> <span class="nv">package</span> <span class="o">=</span> <span class="kt">Package</span><span class="p">(</span>
+<span class="k">let</span> <span class="nv">package</span> <span class="o">=</span> <span class="nf">Package</span><span class="p">(</span>
    <span class="nv">name</span><span class="p">:</span> <span class="s">"socket.io-test"</span><span class="p">,</span>
    <span class="nv">products</span><span class="p">:</span> <span class="p">[</span>
        <span class="o">.</span><span class="nf">executable</span><span class="p">(</span><span class="nv">name</span><span class="p">:</span> <span class="s">"socket.io-test"</span><span class="p">,</span> <span class="nv">targets</span><span class="p">:</span> <span class="p">[</span><span class="s">"YourTargetName"</span><span class="p">])</span>
@ -302,7 +281,7 @@
 <h3 id='carthage' class='heading'>Carthage</h3>

 <p>Add this line to your <code>Cartfile</code>:</p>
-<pre class="highlight plaintext"><code>github "socketio/socket.io-client-swift" ~&gt; 15.2.0
+<pre class="highlight plaintext"><code>github "socketio/socket.io-client-swift" ~&gt; 15.1.0
 </code></pre>

 <p>Run <code>carthage update --platform ios,macosx</code>.</p>
@ -314,7 +293,7 @@
 <pre class="highlight ruby"><code><span class="n">use_frameworks!</span>

 <span class="n">target</span> <span class="s1">'YourApp'</span> <span class="k">do</span>
-    <span class="n">pod</span> <span class="s1">'Socket.IO-Client-Swift'</span><span class="p">,</span> <span class="s1">'~&gt; 15.2.0'</span>
+    <span class="n">pod</span> <span class="s1">'Socket.IO-Client-Swift'</span><span class="p">,</span> <span class="s1">'~&gt; 15.1.0'</span>
 <span class="k">end</span>
 </code></pre>

@ -355,8 +334,8 @@
      </article>
    </div>
    <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2021-02-01)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.13.6</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
+      <p>&copy; 2019 <a class="link" href="https://github.com/socketio/socket.io-client-swift" target="_blank" rel="external">Erik</a>. All rights reserved. (Last updated: 2019-05-28)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v0.9.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external">Realm</a> project.</p>
    </section>
  </body>
 </div>
--- a/docs/js/jazzy.js
+++ b/docs/js/jazzy.js
@ -8,41 +8,26 @@ if (navigator.userAgent.match(/xcode/i)) {
  window.jazzy.docset = true
 }

-function toggleItem($link, $content) {
+// On doc load, toggle the URL hash discussion if present
+$(document).ready(function() {
+  if (!window.jazzy.docset) {
+    var linkToHash = $('a[href="' + window.location.hash +'"]');
+    linkToHash.trigger("click");
+  }
+});
+
+// On token click, toggle its discussion and animate token.marginLeft
+$(".token").click(function(event) {
+  if (window.jazzy.docset) {
+    return;
+  }
+  var link = $(this);
  var animationDuration = 300;
-  $link.toggleClass('token-open');
+  $content = link.parent().parent().next();
  $content.slideToggle(animationDuration);
-}
-
-function itemLinkToContent($link) {
-  return $link.parent().parent().next();
-}
-
-// On doc load + hash-change, open any targetted item
-function openCurrentItemIfClosed() {
-  if (window.jazzy.docset) {
-    return;
-  }
-  var $link = $(`a[name="${location.hash.substring(1)}"]`).nextAll('.token');
-  $content = itemLinkToContent($link);
-  if ($content.is(':hidden')) {
-    toggleItem($link, $content);
-  }
-}
-
-$(openCurrentItemIfClosed);
-$(window).on('hashchange', openCurrentItemIfClosed);
-
-// On item link ('token') click, toggle its discussion
-$('.token').on('click', function(event) {
-  if (window.jazzy.docset) {
-    return;
-  }
-  var $link = $(this);
-  toggleItem($link, itemLinkToContent($link));

  // Keeps the document from jumping to the hash.
-  var href = $link.attr('href');
+  var href = $(this).attr('href');
  if (history.pushState) {
    history.pushState({}, '', href);
  } else {
@ -51,20 +36,8 @@ $('.token').on('click', function(event) {
  event.preventDefault();
 });

-// Clicks on links to the current, closed, item need to open the item
-$("a:not('.token')").on('click', function() {
-  if (location == this.href) {
-    openCurrentItemIfClosed();
-  }
+// Dumb down quotes within code blocks that delimit strings instead of quotations
+// https://github.com/realm/jazzy/issues/714
+$("code q").replaceWith(function () {
+  return ["\"", $(this).contents(), "\""];
 });
-
-// KaTeX rendering
-if ("katex" in window) {
-  $($('.math').each( (_, element) => {
-    katex.render(element.textContent, element, {
-      displayMode: $(element).hasClass('m-block'),
-      throwOnError: false,
-      trust: true
-    });
-  }))
-}
--- a/docs/js/jazzy.search.js
+++ b/docs/js/jazzy.search.js
@ -1,4 +1,9 @@
 $(function(){
+  var searchIndex = lunr(function() {
+    this.ref('url');
+    this.field('name');
+  });
+
  var $typeahead = $('[data-typeahead]');
  var $form = $typeahead.parents('form');
  var searchURL = $form.attr('action');
@ -21,34 +26,21 @@ $(function(){
    $form.addClass('loading');

    $.getJSON(searchURL).then(function(searchData) {
-      const searchIndex = lunr(function() {
-        this.ref('url');
-        this.field('name');
-        this.field('abstract');
-        for (const [url, doc] of Object.entries(searchData)) {
-          this.add({url: url, name: doc.name, abstract: doc.abstract});
-        }
+      $.each(searchData, function (url, doc) {
+        searchIndex.add({url: url, name: doc.name});
      });

      $typeahead.typeahead(
        {
          highlight: true,
-          minLength: 3,
-          autoselect: true
+          minLength: 3
        },
        {
          limit: 10,
          display: displayTemplate,
          templates: { suggestion: suggestionTemplate },
          source: function(query, sync) {
-            const lcSearch = query.toLowerCase();
-            const results = searchIndex.query(function(q) {
-                q.term(lcSearch, { boost: 100 });
-                q.term(lcSearch, {
-                  boost: 10,
-                  wildcard: lunr.Query.wildcard.TRAILING
-                });
-            }).map(function(result) {
+            var results = searchIndex.search(query).map(function(result) {
              var doc = searchData[result.ref];
              doc.url = result.ref;
              return doc;
--- a/docs/js/jquery.min.js
+++ b/docs/js/jquery.min.js
--- a/docs/js/lunr.min.js
+++ b/docs/js/lunr.min.js
--- a/docs/js/typeahead.jquery.js
+++ b/docs/js/typeahead.jquery.js
@ -1,19 +1,18 @@
 /*!
- * typeahead.js 1.3.1
- * https://github.com/corejavascript/typeahead.js
- * Copyright 2013-2020 Twitter, Inc. and other contributors; Licensed MIT
+ * typeahead.js 0.11.1
+ * https://github.com/twitter/typeahead.js
+ * Copyright 2013-2015 Twitter, Inc. and other contributors; Licensed MIT
 */

-
 (function(root, factory) {
    if (typeof define === "function" && define.amd) {
-        define([ "jquery" ], function(a0) {
+        define("typeahead.js", [ "jquery" ], function(a0) {
            return factory(a0);
        });
-    } else if (typeof module === "object" && module.exports) {
+    } else if (typeof exports === "object") {
        module.exports = factory(require("jquery"));
    } else {
-        factory(root["jQuery"]);
+        factory(jQuery);
    }
 })(this, function($) {
    var _ = function() {
@ -149,13 +148,6 @@
            stringify: function(val) {
                return _.isString(val) ? val : JSON.stringify(val);
            },
-            guid: function() {
-                function _p8(s) {
-                    var p = (Math.random().toString(16) + "000000000").substr(2, 8);
-                    return s ? "-" + p.substr(0, 4) + "-" + p.substr(4, 4) : p;
-                }
-                return "tt-" + _p8() + _p8(true) + _p8(true) + _p8();
-            },
            noop: function() {}
        };
    }();
@ -197,7 +189,7 @@
        function buildHtml(c) {
            return {
                wrapper: '<span class="' + c.wrapper + '"></span>',
-                menu: '<div role="listbox" class="' + c.menu + '"></div>'
+                menu: '<div class="' + c.menu + '"></div>'
            };
        }
        function buildSelectors(classes) {
@ -272,8 +264,10 @@
        }
        _.mixin(EventBus.prototype, {
            _trigger: function(type, args) {
-                var $e = $.Event(namespace + type);
-                this.$el.trigger.call(this.$el, $e, args || []);
+                var $e;
+                $e = $.Event(namespace + type);
+                (args = args || []).unshift($e);
+                this.$el.trigger.apply(this.$el, args);
                return $e;
            },
            before: function(type) {
@ -390,36 +384,7 @@
            tagName: "strong",
            className: null,
            wordsOnly: false,
-            caseSensitive: false,
-            diacriticInsensitive: false
-        };
-        var accented = {
-            A: "[AaªÀ-Åà-åĀ-ąǍǎȀ-ȃȦȧᴬᵃḀḁẚẠ-ảₐ℀℁℻⒜Ⓐⓐ㍱-㍴㎀-㎄㎈㎉㎩-㎯㏂㏊㏟㏿Ａａ]",
-            B: "[BbᴮᵇḂ-ḇℬ⒝Ⓑⓑ㍴㎅-㎇㏃㏈㏔㏝Ｂｂ]",
-            C: "[CcÇçĆ-čᶜ℀ℂ℃℅℆ℭⅭⅽ⒞Ⓒⓒ㍶㎈㎉㎝㎠㎤㏄-㏇Ｃｃ]",
-            D: "[DdĎďǄ-ǆǱ-ǳᴰᵈḊ-ḓⅅⅆⅮⅾ⒟Ⓓⓓ㋏㍲㍷-㍹㎗㎭-㎯㏅㏈Ｄｄ]",
-            E: "[EeÈ-Ëè-ëĒ-ěȄ-ȇȨȩᴱᵉḘ-ḛẸ-ẽₑ℡ℯℰⅇ⒠Ⓔⓔ㉐㋍㋎Ｅｅ]",
-            F: "[FfᶠḞḟ℉ℱ℻⒡Ⓕⓕ㎊-㎌㎙ﬀ-ﬄＦｆ]",
-            G: "[GgĜ-ģǦǧǴǵᴳᵍḠḡℊ⒢Ⓖⓖ㋌㋍㎇㎍-㎏㎓㎬㏆㏉㏒㏿Ｇｇ]",
-            H: "[HhĤĥȞȟʰᴴḢ-ḫẖℋ-ℎ⒣Ⓗⓗ㋌㍱㎐-㎔㏊㏋㏗Ｈｈ]",
-            I: "[IiÌ-Ïì-ïĨ-İĲĳǏǐȈ-ȋᴵᵢḬḭỈ-ịⁱℐℑℹⅈⅠ-ⅣⅥ-ⅨⅪⅫⅰ-ⅳⅵ-ⅸⅺⅻ⒤Ⓘⓘ㍺㏌㏕ﬁﬃＩｉ]",
-            J: "[JjĲ-ĵǇ-ǌǰʲᴶⅉ⒥ⒿⓙⱼＪｊ]",
-            K: "[KkĶķǨǩᴷᵏḰ-ḵK⒦Ⓚⓚ㎄㎅㎉㎏㎑㎘㎞㎢㎦㎪㎸㎾㏀㏆㏍-㏏Ｋｋ]",
-            L: "[LlĹ-ŀǇ-ǉˡᴸḶḷḺ-ḽℒℓ℡Ⅼⅼ⒧Ⓛⓛ㋏㎈㎉㏐-㏓㏕㏖㏿ﬂﬄＬｌ]",
-            M: "[MmᴹᵐḾ-ṃ℠™ℳⅯⅿ⒨Ⓜⓜ㍷-㍹㎃㎆㎎㎒㎖㎙-㎨㎫㎳㎷㎹㎽㎿㏁㏂㏎㏐㏔-㏖㏘㏙㏞㏟Ｍｍ]",
-            N: "[NnÑñŃ-ŉǊ-ǌǸǹᴺṄ-ṋⁿℕ№⒩Ⓝⓝ㎁㎋㎚㎱㎵㎻㏌㏑Ｎｎ]",
-            O: "[OoºÒ-Öò-öŌ-őƠơǑǒǪǫȌ-ȏȮȯᴼᵒỌ-ỏₒ℅№ℴ⒪Ⓞⓞ㍵㏇㏒㏖Ｏｏ]",
-            P: "[PpᴾᵖṔ-ṗℙ⒫Ⓟⓟ㉐㍱㍶㎀㎊㎩-㎬㎰㎴㎺㏋㏗-㏚Ｐｐ]",
-            Q: "[Qqℚ⒬Ⓠⓠ㏃Ｑｑ]",
-            R: "[RrŔ-řȐ-ȓʳᴿᵣṘ-ṛṞṟ₨ℛ-ℝ⒭Ⓡⓡ㋍㍴㎭-㎯㏚㏛Ｒｒ]",
-            S: "[SsŚ-šſȘșˢṠ-ṣ₨℁℠⒮Ⓢⓢ㎧㎨㎮-㎳㏛㏜ﬆＳｓ]",
-            T: "[TtŢ-ťȚțᵀᵗṪ-ṱẗ℡™⒯Ⓣⓣ㉐㋏㎔㏏ﬅﬆＴｔ]",
-            U: "[UuÙ-Üù-üŨ-ųƯưǓǔȔ-ȗᵁᵘᵤṲ-ṷỤ-ủ℆⒰Ⓤⓤ㍳㍺Ｕｕ]",
-            V: "[VvᵛᵥṼ-ṿⅣ-Ⅷⅳ-ⅷ⒱Ⓥⓥⱽ㋎㍵㎴-㎹㏜㏞Ｖｖ]",
-            W: "[WwŴŵʷᵂẀ-ẉẘ⒲Ⓦⓦ㎺-㎿㏝Ｗｗ]",
-            X: "[XxˣẊ-ẍₓ℻Ⅸ-Ⅻⅸ-ⅻ⒳Ⓧⓧ㏓Ｘｘ]",
-            Y: "[YyÝýÿŶ-ŸȲȳʸẎẏẙỲ-ỹ⒴Ⓨⓨ㏉Ｙｙ]",
-            Z: "[ZzŹ-žǱ-ǳᶻẐ-ẕℤℨ⒵Ⓩⓩ㎐-㎔Ｚｚ]"
+            caseSensitive: false
        };
        return function hightlight(o) {
            var regex;
@ -428,7 +393,7 @@
                return;
            }
            o.pattern = _.isArray(o.pattern) ? o.pattern : [ o.pattern ];
-            regex = getRegex(o.pattern, o.caseSensitive, o.wordsOnly, o.diacriticInsensitive);
+            regex = getRegex(o.pattern, o.caseSensitive, o.wordsOnly);
            traverse(o.node, hightlightTextNode);
            function hightlightTextNode(textNode) {
                var match, patternNode, wrapperNode;
@ -454,17 +419,10 @@
                }
            }
        };
-        function accent_replacer(chr) {
-            return accented[chr.toUpperCase()] || chr;
-        }
-        function getRegex(patterns, caseSensitive, wordsOnly, diacriticInsensitive) {
+        function getRegex(patterns, caseSensitive, wordsOnly) {
            var escapedPatterns = [], regexStr;
            for (var i = 0, len = patterns.length; i < len; i++) {
-                var escapedWord = _.escapeRegExChars(patterns[i]);
-                if (diacriticInsensitive) {
-                    escapedWord = escapedWord.replace(/\S/g, accent_replacer);
-                }
-                escapedPatterns.push(escapedWord);
+                escapedPatterns.push(_.escapeRegExChars(patterns[i]));
            }
            regexStr = wordsOnly ? "\\b(" + escapedPatterns.join("|") + ")\\b" : "(" + escapedPatterns.join("|") + ")";
            return caseSensitive ? new RegExp(regexStr) : new RegExp(regexStr, "i");
@ -483,7 +441,6 @@
            40: "down"
        };
        function Input(o, www) {
-            var id;
            o = o || {};
            if (!o.input) {
                $.error("input is missing");
@ -491,18 +448,6 @@
            www.mixin(this);
            this.$hint = $(o.hint);
            this.$input = $(o.input);
-            this.$menu = $(o.menu);
-            id = this.$input.attr("id") || _.guid();
-            this.$menu.attr("id", id + "_listbox");
-            this.$hint.attr({
-                "aria-hidden": true
-            });
-            this.$input.attr({
-                "aria-owns": id + "_listbox",
-                role: "combobox",
-                "aria-autocomplete": "list",
-                "aria-expanded": false
-            });
            this.query = this.$input.val();
            this.queryWhenFocused = this.hasFocus() ? this.query : null;
            this.$overflowHelper = buildOverflowHelper(this.$input);
@ -510,7 +455,6 @@
            if (this.$hint.length === 0) {
                this.setHint = this.getHint = this.clearHint = this.clearHintIfInvalid = _.noop;
            }
-            this.onSync("cursorchange", this._updateDescendent);
        }
        Input.normalizeQuery = function(str) {
            return _.toStr(str).replace(/^\s*/g, "").replace(/\s{2,}/g, " ");
@ -580,9 +524,6 @@
                    this.trigger("whitespaceChanged", this.query);
                }
            },
-            _updateDescendent: function updateDescendent(event, id) {
-                this.$input.attr("aria-activedescendant", id);
-            },
            bind: function() {
                var that = this, onBlur, onFocus, onKeydown, onInput;
                onBlur = _.bind(this._onBlur, this);
@ -675,9 +616,6 @@
                this.$input.off(".tt");
                this.$overflowHelper.remove();
                this.$hint = this.$input = this.$overflowHelper = $("<div>");
-            },
-            setAriaExpanded: function setAriaExpanded(value) {
-                this.$input.attr("aria-expanded", value);
            }
        });
        return Input;
@ -709,7 +647,6 @@
        "use strict";
        var keys, nameGenerator;
        keys = {
-            dataset: "tt-selectable-dataset",
            val: "tt-selectable-display",
            obj: "tt-selectable-object"
        };
@ -729,20 +666,19 @@
            }
            www.mixin(this);
            this.highlight = !!o.highlight;
-            this.name = _.toStr(o.name || nameGenerator());
+            this.name = o.name || nameGenerator();
            this.limit = o.limit || 5;
            this.displayFn = getDisplayFn(o.display || o.displayKey);
            this.templates = getTemplates(o.templates, this.displayFn);
            this.source = o.source.__ttAdapter ? o.source.__ttAdapter() : o.source;
            this.async = _.isUndefined(o.async) ? this.source.length > 2 : !!o.async;
            this._resetLastSuggestion();
-            this.$el = $(o.node).attr("role", "presentation").addClass(this.classes.dataset).addClass(this.classes.dataset + "-" + this.name);
+            this.$el = $(o.node).addClass(this.classes.dataset).addClass(this.classes.dataset + "-" + this.name);
        }
        Dataset.extractData = function extractData(el) {
            var $el = $(el);
            if ($el.data(keys.obj)) {
                return {
-                    dataset: $el.data(keys.dataset) || "",
                    val: $el.data(keys.val) || "",
                    obj: $el.data(keys.obj) || null
                };
@ -761,7 +697,7 @@
                } else {
                    this._empty();
                }
-                this.trigger("rendered", suggestions, false, this.name);
+                this.trigger("rendered", this.name, suggestions, false);
            },
            _append: function append(query, suggestions) {
                suggestions = suggestions || [];
@ -772,7 +708,7 @@
                } else if (!this.$lastSuggestion.length && this.templates.notFound) {
                    this._renderNotFound(query);
                }
-                this.trigger("rendered", suggestions, true, this.name);
+                this.trigger("rendered", this.name, suggestions, true);
            },
            _renderSuggestions: function renderSuggestions(query, suggestions) {
                var $fragment;
@ -813,7 +749,7 @@
                _.each(suggestions, function getSuggestionNode(suggestion) {
                    var $el, context;
                    context = that._injectQuery(query, suggestion);
-                    $el = $(that.templates.suggestion(context)).data(keys.dataset, that.name).data(keys.obj, suggestion).data(keys.val, that.displayFn(suggestion)).addClass(that.classes.suggestion + " " + that.classes.selectable);
+                    $el = $(that.templates.suggestion(context)).data(keys.obj, suggestion).data(keys.val, that.displayFn(suggestion)).addClass(that.classes.suggestion + " " + that.classes.selectable);
                    fragment.appendChild($el[0]);
                });
                this.highlight && highlight({
@ -851,7 +787,7 @@
                this.cancel = function cancel() {
                    canceled = true;
                    that.cancel = $.noop;
-                    that.async && that.trigger("asyncCanceled", query, that.name);
+                    that.async && that.trigger("asyncCanceled", query);
                };
                this.source(query, sync, async);
                !syncCalled && sync([]);
@ -864,17 +800,16 @@
                    rendered = suggestions.length;
                    that._overwrite(query, suggestions);
                    if (rendered < that.limit && that.async) {
-                        that.trigger("asyncRequested", query, that.name);
+                        that.trigger("asyncRequested", query);
                    }
                }
                function async(suggestions) {
                    suggestions = suggestions || [];
                    if (!canceled && rendered < that.limit) {
                        that.cancel = $.noop;
-                        var idx = Math.abs(rendered - that.limit);
-                        rendered += idx;
-                        that._append(query, suggestions.slice(0, idx));
-                        that.async && that.trigger("asyncReceived", query, that.name);
+                        rendered += suggestions.length;
+                        that._append(query, suggestions.slice(0, that.limit - rendered));
+                        that.async && that.trigger("asyncReceived", query);
                    }
                }
            },
@ -905,14 +840,10 @@
                pending: templates.pending && _.templatify(templates.pending),
                header: templates.header && _.templatify(templates.header),
                footer: templates.footer && _.templatify(templates.footer),
-                suggestion: templates.suggestion ? userSuggestionTemplate : suggestionTemplate
+                suggestion: templates.suggestion || suggestionTemplate
            };
-            function userSuggestionTemplate(context) {
-                var template = templates.suggestion;
-                return $(template(context)).attr("id", _.guid());
-            }
            function suggestionTemplate(context) {
-                return $('<div role="option">').attr("id", _.guid()).text(displayFn(context));
+                return $("<div>").text(displayFn(context));
            }
        }
        function isValidName(str) {
@ -953,11 +884,10 @@
                this.trigger.apply(this, arguments);
            },
            _allDatasetsEmpty: function allDatasetsEmpty() {
-                return _.every(this.datasets, _.bind(function isDatasetEmpty(dataset) {
-                    var isEmpty = dataset.isEmpty();
-                    this.$node.attr("aria-expanded", !isEmpty);
-                    return isEmpty;
-                }, this));
+                return _.every(this.datasets, isDatasetEmpty);
+                function isDatasetEmpty(dataset) {
+                    return dataset.isEmpty();
+                }
            },
            _getSelectables: function getSelectables() {
                return this.$node.find(this.selectors.selectable);
@ -982,12 +912,6 @@
                var that = this, onSelectableClick;
                onSelectableClick = _.bind(this._onSelectableClick, this);
                this.$node.on("click.tt", this.selectors.selectable, onSelectableClick);
-                this.$node.on("mouseover", this.selectors.selectable, function() {
-                    that.setCursor($(this));
-                });
-                this.$node.on("mouseleave", function() {
-                    that._removeCursor();
-                });
                _.each(this.datasets, function(dataset) {
                    dataset.onSync("asyncRequested", that._propagate, that).onSync("asyncCanceled", that._propagate, that).onSync("asyncReceived", that._propagate, that).onSync("rendered", that._onRendered, that).onSync("cleared", that._onCleared, that);
                });
@ -997,11 +921,9 @@
                return this.$node.hasClass(this.classes.open);
            },
            open: function open() {
-                this.$node.scrollTop(0);
                this.$node.addClass(this.classes.open);
            },
            close: function close() {
-                this.$node.attr("aria-expanded", false);
                this.$node.removeClass(this.classes.open);
                this._removeCursor();
            },
@ -1066,55 +988,6 @@
        });
        return Menu;
    }();
-    var Status = function() {
-        "use strict";
-        function Status(options) {
-            this.$el = $("<span></span>", {
-                role: "status",
-                "aria-live": "polite"
-            }).css({
-                position: "absolute",
-                padding: "0",
-                border: "0",
-                height: "1px",
-                width: "1px",
-                "margin-bottom": "-1px",
-                "margin-right": "-1px",
-                overflow: "hidden",
-                clip: "rect(0 0 0 0)",
-                "white-space": "nowrap"
-            });
-            options.$input.after(this.$el);
-            _.each(options.menu.datasets, _.bind(function(dataset) {
-                if (dataset.onSync) {
-                    dataset.onSync("rendered", _.bind(this.update, this));
-                    dataset.onSync("cleared", _.bind(this.cleared, this));
-                }
-            }, this));
-        }
-        _.mixin(Status.prototype, {
-            update: function update(event, suggestions) {
-                var length = suggestions.length;
-                var words;
-                if (length === 1) {
-                    words = {
-                        result: "result",
-                        is: "is"
-                    };
-                } else {
-                    words = {
-                        result: "results",
-                        is: "are"
-                    };
-                }
-                this.$el.text(length + " " + words.result + " " + words.is + " available, use up and down arrow keys to navigate.");
-            },
-            cleared: function() {
-                this.$el.text("");
-            }
-        });
-        return Status;
-    }();
    var DefaultMenu = function() {
        "use strict";
        var s = Menu.prototype;
@ -1179,7 +1052,6 @@
            this.input = o.input;
            this.menu = o.menu;
            this.enabled = true;
-            this.autoselect = !!o.autoselect;
            this.active = false;
            this.input.hasFocus() && this.activate();
            this.dir = this.input.getLangDir();
@ -1226,12 +1098,8 @@
            _onDatasetCleared: function onDatasetCleared() {
                this._updateHint();
            },
-            _onDatasetRendered: function onDatasetRendered(type, suggestions, async, dataset) {
+            _onDatasetRendered: function onDatasetRendered(type, dataset, suggestions, async) {
                this._updateHint();
-                if (this.autoselect) {
-                    var cursorClass = this.selectors.cursor.substr(1);
-                    this.menu.$node.find(this.selectors.suggestion).first().addClass(cursorClass);
-                }
                this.eventBus.trigger("render", suggestions, async, dataset);
            },
            _onAsyncRequested: function onAsyncRequested(type, dataset, query) {
@ -1254,25 +1122,15 @@
            _onEnterKeyed: function onEnterKeyed(type, $e) {
                var $selectable;
                if ($selectable = this.menu.getActiveSelectable()) {
-                    if (this.select($selectable)) {
-                        $e.preventDefault();
-                        $e.stopPropagation();
-                    }
-                } else if (this.autoselect) {
-                    if (this.select(this.menu.getTopSelectable())) {
-                        $e.preventDefault();
-                        $e.stopPropagation();
-                    }
+                    this.select($selectable) && $e.preventDefault();
                }
            },
            _onTabKeyed: function onTabKeyed(type, $e) {
                var $selectable;
                if ($selectable = this.menu.getActiveSelectable()) {
                    this.select($selectable) && $e.preventDefault();
-                } else if (this.autoselect) {
-                    if ($selectable = this.menu.getTopSelectable()) {
-                        this.autocomplete($selectable) && $e.preventDefault();
-                    }
+                } else if ($selectable = this.menu.getTopSelectable()) {
+                    this.autocomplete($selectable) && $e.preventDefault();
                }
            },
            _onEscKeyed: function onEscKeyed() {
@ -1286,12 +1144,12 @@
            },
            _onLeftKeyed: function onLeftKeyed() {
                if (this.dir === "rtl" && this.input.isCursorAtEnd()) {
-                    this.autocomplete(this.menu.getActiveSelectable() || this.menu.getTopSelectable());
+                    this.autocomplete(this.menu.getTopSelectable());
                }
            },
            _onRightKeyed: function onRightKeyed() {
                if (this.dir === "ltr" && this.input.isCursorAtEnd()) {
-                    this.autocomplete(this.menu.getActiveSelectable() || this.menu.getTopSelectable());
+                    this.autocomplete(this.menu.getTopSelectable());
                }
            },
            _onQueryChanged: function onQueryChanged(e, query) {
@ -1368,7 +1226,6 @@
            },
            open: function open() {
                if (!this.isOpen() && !this.eventBus.before("open")) {
-                    this.input.setAriaExpanded(true);
                    this.menu.open();
                    this._updateHint();
                    this.eventBus.trigger("open");
@ -1377,7 +1234,6 @@
            },
            close: function close() {
                if (this.isOpen() && !this.eventBus.before("close")) {
-                    this.input.setAriaExpanded(false);
                    this.menu.close();
                    this.input.clearHint();
                    this.input.resetInputValue();
@ -1393,9 +1249,9 @@
            },
            select: function select($selectable) {
                var data = this.menu.getSelectableData($selectable);
-                if (data && !this.eventBus.before("select", data.obj, data.dataset)) {
+                if (data && !this.eventBus.before("select", data.obj)) {
                    this.input.setQuery(data.val, true);
-                    this.eventBus.trigger("select", data.obj, data.dataset);
+                    this.eventBus.trigger("select", data.obj);
                    this.close();
                    return true;
                }
@ -1406,34 +1262,29 @@
                query = this.input.getQuery();
                data = this.menu.getSelectableData($selectable);
                isValid = data && query !== data.val;
-                if (isValid && !this.eventBus.before("autocomplete", data.obj, data.dataset)) {
+                if (isValid && !this.eventBus.before("autocomplete", data.obj)) {
                    this.input.setQuery(data.val);
-                    this.eventBus.trigger("autocomplete", data.obj, data.dataset);
+                    this.eventBus.trigger("autocomplete", data.obj);
                    return true;
                }
                return false;
            },
            moveCursor: function moveCursor(delta) {
-                var query, $candidate, data, suggestion, datasetName, cancelMove, id;
+                var query, $candidate, data, payload, cancelMove;
                query = this.input.getQuery();
                $candidate = this.menu.selectableRelativeToCursor(delta);
                data = this.menu.getSelectableData($candidate);
-                suggestion = data ? data.obj : null;
-                datasetName = data ? data.dataset : null;
-                id = $candidate ? $candidate.attr("id") : null;
-                this.input.trigger("cursorchange", id);
+                payload = data ? data.obj : null;
                cancelMove = this._minLengthMet() && this.menu.update(query);
-                if (!cancelMove && !this.eventBus.before("cursorchange", suggestion, datasetName)) {
+                if (!cancelMove && !this.eventBus.before("cursorchange", payload)) {
                    this.menu.setCursor($candidate);
                    if (data) {
-                        if (typeof data.val === "string") {
-                            this.input.setInputValue(data.val);
-                        }
+                        this.input.setInputValue(data.val);
                    } else {
                        this.input.resetInputValue();
                        this._updateHint();
                    }
-                    this.eventBus.trigger("cursorchange", suggestion, datasetName);
+                    this.eventBus.trigger("cursorchange", payload);
                    return true;
                }
                return false;
@ -1471,7 +1322,7 @@
                www = WWW(o.classNames);
                return this.each(attach);
                function attach() {
-                    var $input, $wrapper, $hint, $menu, defaultHint, defaultMenu, eventBus, input, menu, status, typeahead, MenuConstructor;
+                    var $input, $wrapper, $hint, $menu, defaultHint, defaultMenu, eventBus, input, menu, typeahead, MenuConstructor;
                    _.each(datasets, function(d) {
                        d.highlight = !!o.highlight;
                    });
@ -1496,23 +1347,17 @@
                    });
                    input = new Input({
                        hint: $hint,
-                        input: $input,
-                        menu: $menu
+                        input: $input
                    }, www);
                    menu = new MenuConstructor({
                        node: $menu,
                        datasets: datasets
                    }, www);
-                    status = new Status({
-                        $input: $input,
-                        menu: menu
-                    });
                    typeahead = new Typeahead({
                        input: input,
                        menu: menu,
                        eventBus: eventBus,
-                        minLength: o.minLength,
-                        autoselect: o.autoselect
+                        minLength: o.minLength
                    }, www);
                    $input.data(keys.www, www);
                    $input.data(keys.typeahead, typeahead);
@ -1605,7 +1450,7 @@
                    return query;
                } else {
                    ttEach(this, function(t) {
-                        t.setVal(_.toStr(newVal));
+                        t.setVal(newVal);
                    });
                    return this;
                }
@ -1636,10 +1481,8 @@
            });
        }
        function buildHintFromInput($input, www) {
-            return $input.clone().addClass(www.classes.hint).removeData().css(www.css.hint).css(getBackgroundStyles($input)).prop({
-                readonly: true,
-                required: false
-            }).removeAttr("id name placeholder").removeClass("required").attr({
+            return $input.clone().addClass(www.classes.hint).removeData().css(www.css.hint).css(getBackgroundStyles($input)).prop("readonly", true).removeAttr("id name placeholder required").attr({
+                autocomplete: "off",
                spellcheck: "false",
                tabindex: -1
            });
@ -1652,6 +1495,7 @@
                style: $input.attr("style")
            });
            $input.addClass(www.classes.input).attr({
+                autocomplete: "off",
                spellcheck: false
            });
            try {
--- a/docs/search.json
+++ b/docs/search.json