diff --git a/EventsTree.xcodeproj/project.pbxproj b/EventsTree.xcodeproj/project.pbxproj
index 6468498..5e06807 100644
--- a/EventsTree.xcodeproj/project.pbxproj
+++ b/EventsTree.xcodeproj/project.pbxproj
@@ -166,11 +166,13 @@
 					9238D8CA1F0107AC00D19D0F = {
 						CreatedOnToolsVersion = 8.3.3;
 						DevelopmentTeam = 4GS5NBU7N5;
+						LastSwiftMigration = 1010;
 						ProvisioningStyle = Automatic;
 					};
 					9238D8D31F0107AC00D19D0F = {
 						CreatedOnToolsVersion = 8.3.3;
 						DevelopmentTeam = 4GS5NBU7N5;
+						LastSwiftMigration = 1010;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -314,7 +316,8 @@
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -373,7 +376,8 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -434,7 +438,8 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -483,7 +488,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
diff --git a/EventsTreeiOSExample/EventsTreeiOSExample.xcodeproj/project.pbxproj b/EventsTreeiOSExample/EventsTreeiOSExample.xcodeproj/project.pbxproj
index 7de69c8..e84a541 100644
--- a/EventsTreeiOSExample/EventsTreeiOSExample.xcodeproj/project.pbxproj
+++ b/EventsTreeiOSExample/EventsTreeiOSExample.xcodeproj/project.pbxproj
@@ -14,7 +14,6 @@
 		9228A7871F03143000985134 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9228A7781F03143000985134 /* LaunchScreen.storyboard */; };
 		9228A7881F03143000985134 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9228A77A1F03143000985134 /* Main.storyboard */; };
 		9228A7891F03143000985134 /* MWSegmentedControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9228A77D1F03143000985134 /* MWSegmentedControl.swift */; };
-		9228A78A1F03143000985134 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9228A77F1F03143000985134 /* Info.plist */; };
 		9228A78B1F03143000985134 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9228A7811F03143000985134 /* MainViewController.swift */; };
 		9228A78C1F03143000985134 /* TreeNodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9228A7821F03143000985134 /* TreeNodeView.swift */; };
 		9228A78D1F03143000985134 /* TreeNodeView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9228A7831F03143000985134 /* TreeNodeView.xib */; };
@@ -171,7 +170,6 @@
 				92C763BF1EFACBF9007F2C30 /* Frameworks */,
 				92C763C01EFACBF9007F2C30 /* Resources */,
 				59B4BC437E80EFD3C715F29C /* [CP] Embed Pods Frameworks */,
-				3354905DA43DBADDD8F0B75D /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -195,7 +193,7 @@
 					92C763C11EFACBF9007F2C30 = {
 						CreatedOnToolsVersion = 8.3.3;
 						DevelopmentTeam = 4GS5NBU7N5;
-						LastSwiftMigration = 0830;
+						LastSwiftMigration = 1010;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -224,7 +222,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				9228A78D1F03143000985134 /* TreeNodeView.xib in Resources */,
-				9228A78A1F03143000985134 /* Info.plist in Resources */,
 				9228A7881F03143000985134 /* Main.storyboard in Resources */,
 				9228A7861F03143000985134 /* Assets.xcassets in Resources */,
 				9228A7871F03143000985134 /* LaunchScreen.storyboard in Resources */,
@@ -234,34 +231,24 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		3354905DA43DBADDD8F0B75D /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-IOSExample/Pods-IOSExample-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		59B4BC437E80EFD3C715F29C /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-IOSExample/Pods-IOSExample-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/AMPopTip/AMPopTip.framework",
+				"${BUILT_PRODUCTS_DIR}/EventsTree/EventsTree.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AMPopTip.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EventsTree.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-IOSExample/Pods-IOSExample-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-IOSExample/Pods-IOSExample-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		EE7B219573F162C3C85B06DA /* [CP] Check Pods Manifest.lock */ = {
@@ -270,13 +257,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-IOSExample-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -422,7 +412,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = darthrumata.com.EventNodeExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -437,7 +428,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = darthrumata.com.EventNodeExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
diff --git a/EventsTreeiOSExample/Podfile.lock b/EventsTreeiOSExample/Podfile.lock
index 6311002..93d7e62 100644
--- a/EventsTreeiOSExample/Podfile.lock
+++ b/EventsTreeiOSExample/Podfile.lock
@@ -6,10 +6,15 @@ DEPENDENCIES:
   - AMPopTip (= 2.1.6)
   - EventsTree (= 0.2.0)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - AMPopTip
+    - EventsTree
+
 SPEC CHECKSUMS:
   AMPopTip: 81f57556ae12500d30ff595078b1b6d11076ced8
   EventsTree: 1c23c96940e06c64c04cb596d92d5d36d3572a39
 
 PODFILE CHECKSUM: 55da609fe19ac9faf9c47655bc74e0973d35e8c4
 
-COCOAPODS: 1.2.1
+COCOAPODS: 1.6.1
diff --git a/EventsTreeiOSExample/Sources/IOSExample/AppDelegate.swift b/EventsTreeiOSExample/Sources/IOSExample/AppDelegate.swift
index 46a4338..18dce16 100644
--- a/EventsTreeiOSExample/Sources/IOSExample/AppDelegate.swift
+++ b/EventsTreeiOSExample/Sources/IOSExample/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
   var window: UIWindow?
 
 
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
     // Override point for customization after application launch.
     return true
   }
diff --git a/EventsTreeiOSExample/Sources/IOSExample/External/MWSegmentedControl.swift b/EventsTreeiOSExample/Sources/IOSExample/External/MWSegmentedControl.swift
index 33bf15b..784f81c 100755
--- a/EventsTreeiOSExample/Sources/IOSExample/External/MWSegmentedControl.swift
+++ b/EventsTreeiOSExample/Sources/IOSExample/External/MWSegmentedControl.swift
@@ -60,7 +60,7 @@ class MWSegmentedControl: UIView {
     }
   }
 
-  func changeSegment(sender: UIButton) {
+  @objc func changeSegment(sender: UIButton) {
     if allowMultipleSelection {
       if sender.backgroundColor == borderColor {
         sender.backgroundColor = UIColor.clear