diff --git a/LICENSE b/LICENSE
index 5379b5e..03690bf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2016 Roland Moers
+Copyright (c) 2013-2017 Roland Moers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/RMDateSelectionViewController-Demo.xcodeproj/project.pbxproj b/RMDateSelectionViewController-Demo.xcodeproj/project.pbxproj
index 460edf1..382336f 100644
--- a/RMDateSelectionViewController-Demo.xcodeproj/project.pbxproj
+++ b/RMDateSelectionViewController-Demo.xcodeproj/project.pbxproj
@@ -548,7 +548,7 @@
 			attributes = {
 				CLASSPREFIX = RM;
 				LastSwiftUpdateCheck = 0710;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "Roland Moers";
 				TargetAttributes = {
 					CA2C5C0F1DA2699300670F0F = {
@@ -558,7 +558,7 @@
 					CA3009F91BF0E6A100EAD920 = {
 						CreatedOnToolsVersion = 7.1;
 						DevelopmentTeam = GGWH6G3GK6;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 					CA52EE271AC42C760032E877 = {
 						CreatedOnToolsVersion = 6.2;
@@ -909,7 +909,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "de.cooperrs.RMDateSelectionViewController-SwiftDemo";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -929,7 +929,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "de.cooperrs.RMDateSelectionViewController-SwiftDemo";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -973,14 +973,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -1018,14 +1024,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
diff --git a/RMDateSelectionViewController-Demo.xcodeproj/xcshareddata/xcschemes/RMDateSelectionViewController-Demo.xcscheme b/RMDateSelectionViewController-Demo.xcodeproj/xcshareddata/xcschemes/RMDateSelectionViewController-Demo.xcscheme
index 90d07fb..0f0ec69 100644
--- a/RMDateSelectionViewController-Demo.xcodeproj/xcshareddata/xcschemes/RMDateSelectionViewController-Demo.xcscheme
+++ b/RMDateSelectionViewController-Demo.xcodeproj/xcshareddata/xcschemes/RMDateSelectionViewController-Demo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -69,6 +70,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/RMDateSelectionViewController-Demo.xcodeproj/xcshareddata/xcschemes/RMDateSelectionViewController-DemoExtension.xcscheme b/RMDateSelectionViewController-Demo.xcodeproj/xcshareddata/xcschemes/RMDateSelectionViewController-DemoExtension.xcscheme
index 73edbb9..7f02a52 100644
--- a/RMDateSelectionViewController-Demo.xcodeproj/xcshareddata/xcschemes/RMDateSelectionViewController-DemoExtension.xcscheme
+++ b/RMDateSelectionViewController-Demo.xcodeproj/xcshareddata/xcschemes/RMDateSelectionViewController-DemoExtension.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction
@@ -55,6 +55,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -84,6 +85,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = ""
       selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/RMDateSelectionViewController-Demo.xcodeproj/xcshareddata/xcschemes/RMDateSelectionViewController-SwiftDemo.xcscheme b/RMDateSelectionViewController-Demo.xcodeproj/xcshareddata/xcschemes/RMDateSelectionViewController-SwiftDemo.xcscheme
index 73f623e..d07aac9 100644
--- a/RMDateSelectionViewController-Demo.xcodeproj/xcshareddata/xcschemes/RMDateSelectionViewController-SwiftDemo.xcscheme
+++ b/RMDateSelectionViewController-Demo.xcodeproj/xcshareddata/xcschemes/RMDateSelectionViewController-SwiftDemo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -55,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/RMDateSelectionViewController-Demo.xcodeproj/xcshareddata/xcschemes/RMDateSelectionViewController.xcscheme b/RMDateSelectionViewController-Demo.xcodeproj/xcshareddata/xcschemes/RMDateSelectionViewController.xcscheme
index 42e2a68..c763494 100644
--- a/RMDateSelectionViewController-Demo.xcodeproj/xcshareddata/xcschemes/RMDateSelectionViewController.xcscheme
+++ b/RMDateSelectionViewController-Demo.xcodeproj/xcshareddata/xcschemes/RMDateSelectionViewController.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -36,6 +37,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"