diff --git a/.gitignore b/.gitignore
index 5e73fc8..e3b5b29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ build
 OpenSSL-for-iOS.xcodeproj/project.xcworkspace/xcuserdata
 include/openssl
 *.framework
+*.xccheckout
diff --git a/OpenSSL-for-iOS.xcodeproj/project.pbxproj b/OpenSSL-for-iOS.xcodeproj/project.pbxproj
index 2a179cb..558973b 100644
--- a/OpenSSL-for-iOS.xcodeproj/project.pbxproj
+++ b/OpenSSL-for-iOS.xcodeproj/project.pbxproj
@@ -14,8 +14,7 @@
 		533ED30C1528C4840005C6FA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 533ED30B1528C4840005C6FA /* main.m */; };
 		533ED3101528C4840005C6FA /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 533ED30F1528C4840005C6FA /* AppDelegate.m */; };
 		533ED3131528C4840005C6FA /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 533ED3121528C4840005C6FA /* ViewController.m */; };
-		533ED3161528C4840005C6FA /* ViewController_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 533ED3141528C4840005C6FA /* ViewController_iPhone.xib */; };
-		533ED3191528C4840005C6FA /* ViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 533ED3171528C4840005C6FA /* ViewController_iPad.xib */; };
+		533ED3161528C4840005C6FA /* ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 533ED3141528C4840005C6FA /* ViewController.xib */; };
 		533ED32C1528C53B0005C6FA /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 533ED32A1528C53B0005C6FA /* libcrypto.a */; };
 		533ED32D1528C53B0005C6FA /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 533ED32B1528C53B0005C6FA /* libssl.a */; };
 		534FB2AE180975D700B5F868 /* Icons.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 534FB2AD180975D700B5F868 /* Icons.xcassets */; };
@@ -50,8 +49,7 @@
 		533ED30F1528C4840005C6FA /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		533ED3111528C4840005C6FA /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
 		533ED3121528C4840005C6FA /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
-		533ED3151528C4840005C6FA /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ViewController_iPhone.xib; sourceTree = "<group>"; };
-		533ED3181528C4840005C6FA /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ViewController_iPad.xib; sourceTree = "<group>"; };
+		533ED3151528C4840005C6FA /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ViewController.xib; sourceTree = "<group>"; };
 		533ED32A1528C53B0005C6FA /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = lib/libcrypto.a; sourceTree = "<group>"; };
 		533ED32B1528C53B0005C6FA /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = lib/libssl.a; sourceTree = "<group>"; };
 		534FB2AD180975D700B5F868 /* Icons.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Icons.xcassets; sourceTree = "<group>"; };
@@ -63,6 +61,9 @@
 		53572A58183AAFFE00B21832 /* OpenSSL-for-iOS_Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OpenSSL-for-iOS_Tests-Prefix.pch"; sourceTree = "<group>"; };
 		D1E979D803ACC127411934DC /* FSOpenSSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSOpenSSL.h; sourceTree = "<group>"; };
 		D1E97EE2A904D58DAE4231E2 /* FSOpenSSL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSOpenSSL.m; sourceTree = "<group>"; };
+		FD5896FA1B2F1FAA00F3E5B5 /* build-libssl.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "build-libssl.sh"; sourceTree = "<group>"; };
+		FD5896FB1B2F1FB800F3E5B5 /* create-openssl-framework.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "create-openssl-framework.sh"; sourceTree = "<group>"; };
+		FD5896FC1B2F1FF900F3E5B5 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -94,8 +95,10 @@
 		533ED2F01528C4840005C6FA = {
 			isa = PBXGroup;
 			children = (
+				FD5896FC1B2F1FF900F3E5B5 /* README.md */,
 				533ED3051528C4840005C6FA /* OpenSSL-for-iOS */,
 				53572A50183AAFFE00B21832 /* OpenSSL-for-iOS_Tests */,
+				FD5896FD1B2F1FFC00F3E5B5 /* Scripts */,
 				533ED2FE1528C4840005C6FA /* Frameworks */,
 				533ED2FC1528C4840005C6FA /* Products */,
 			);
@@ -130,8 +133,7 @@
 				533ED30F1528C4840005C6FA /* AppDelegate.m */,
 				533ED3111528C4840005C6FA /* ViewController.h */,
 				533ED3121528C4840005C6FA /* ViewController.m */,
-				533ED3141528C4840005C6FA /* ViewController_iPhone.xib */,
-				533ED3171528C4840005C6FA /* ViewController_iPad.xib */,
+				533ED3141528C4840005C6FA /* ViewController.xib */,
 				533ED3061528C4840005C6FA /* Supporting Files */,
 				D1E97EE2A904D58DAE4231E2 /* FSOpenSSL.m */,
 				D1E979D803ACC127411934DC /* FSOpenSSL.h */,
@@ -170,6 +172,15 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		FD5896FD1B2F1FFC00F3E5B5 /* Scripts */ = {
+			isa = PBXGroup;
+			children = (
+				FD5896FA1B2F1FAA00F3E5B5 /* build-libssl.sh */,
+				FD5896FB1B2F1FB800F3E5B5 /* create-openssl-framework.sh */,
+			);
+			name = Scripts;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -214,7 +225,7 @@
 		533ED2F21528C4840005C6FA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0430;
+				LastUpgradeCheck = 0630;
 				ORGANIZATIONNAME = Immobilienscout24;
 				TargetAttributes = {
 					53572A4A183AAFFE00B21832 = {
@@ -246,8 +257,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				533ED30A1528C4840005C6FA /* InfoPlist.strings in Resources */,
-				533ED3161528C4840005C6FA /* ViewController_iPhone.xib in Resources */,
-				533ED3191528C4840005C6FA /* ViewController_iPad.xib in Resources */,
+				533ED3161528C4840005C6FA /* ViewController.xib in Resources */,
 				534FB2AE180975D700B5F868 /* Icons.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -301,20 +311,12 @@
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
 		};
-		533ED3141528C4840005C6FA /* ViewController_iPhone.xib */ = {
+		533ED3141528C4840005C6FA /* ViewController.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
 				533ED3151528C4840005C6FA /* en */,
 			);
-			name = ViewController_iPhone.xib;
-			sourceTree = "<group>";
-		};
-		533ED3171528C4840005C6FA /* ViewController_iPad.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				533ED3181528C4840005C6FA /* en */,
-			);
-			name = ViewController_iPad.xib;
+			name = ViewController.xib;
 			sourceTree = "<group>";
 		};
 		53572A53183AAFFE00B21832 /* InfoPlist.strings */ = {
@@ -332,11 +334,20 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -344,11 +355,15 @@
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "include/**";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -358,13 +373,25 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "include/**";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
@@ -412,7 +439,6 @@
 		53572A5B183AAFFE00B21832 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/OpenSSL.app/OpenSSL";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -451,7 +477,6 @@
 		53572A5C183AAFFE00B21832 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/OpenSSL.app/OpenSSL";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -511,6 +536,7 @@
 				53572A5C183AAFFE00B21832 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
diff --git a/OpenSSL-for-iOS.xcodeproj/xcshareddata/xcschemes/OpenSSL-for-iOS.xcscheme b/OpenSSL-for-iOS.xcodeproj/xcshareddata/xcschemes/OpenSSL-for-iOS.xcscheme
index 6d4d9ff..bdee3e7 100644
--- a/OpenSSL-for-iOS.xcodeproj/xcshareddata/xcschemes/OpenSSL-for-iOS.xcscheme
+++ b/OpenSSL-for-iOS.xcodeproj/xcshareddata/xcschemes/OpenSSL-for-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0500"
+   LastUpgradeVersion = "0630"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -58,7 +58,8 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "533ED2FA1528C4840005C6FA"
@@ -76,7 +77,8 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "533ED2FA1528C4840005C6FA"
diff --git a/OpenSSL-for-iOS/AppDelegate.m b/OpenSSL-for-iOS/AppDelegate.m
index 2263199..20a290b 100644
--- a/OpenSSL-for-iOS/AppDelegate.m
+++ b/OpenSSL-for-iOS/AppDelegate.m
@@ -19,11 +19,7 @@
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-    if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) {
-        self.viewController = [[ViewController alloc] initWithNibName:@"ViewController_iPhone" bundle:nil];
-    } else {
-        self.viewController = [[ViewController alloc] initWithNibName:@"ViewController_iPad" bundle:nil];
-    }
+    self.viewController = [[ViewController alloc] initWithNibName:@"ViewController" bundle:nil];
     self.window.rootViewController = self.viewController;
     [self.window makeKeyAndVisible];
     return YES;
diff --git a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Contents.json b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Contents.json
index b48b2c0..86648a0 100644
--- a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Contents.json
+++ b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Contents.json
@@ -1,92 +1,83 @@
 {
   "images" : [
     {
-      "idiom" : "iphone",
       "size" : "29x29",
-      "scale" : "1x"
-    },
-    {
       "idiom" : "iphone",
-      "size" : "29x29",
+      "filename" : "Icon-Small@2x-1.png",
       "scale" : "2x"
     },
     {
+      "size" : "29x29",
       "idiom" : "iphone",
+      "filename" : "Icon-Small@3x.png",
+      "scale" : "3x"
+    },
+    {
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-Small-40@2x.png",
       "scale" : "2x"
     },
     {
-      "size" : "57x57",
+      "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "Icon.png",
-      "scale" : "1x"
+      "filename" : "Icon-Small-40@3x.png",
+      "scale" : "3x"
     },
     {
-      "size" : "57x57",
-      "idiom" : "iphone",
-      "filename" : "Icon@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-60@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "ipad",
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-60@3x.png",
+      "scale" : "3x"
+    },
+    {
       "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-Small.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-Small@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "ipad",
       "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Icon-Small-40.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Icon-Small-40@2x-1.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "ipad",
-      "size" : "50x50",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "50x50",
-      "scale" : "2x"
-    },
-    {
-      "size" : "72x72",
-      "idiom" : "ipad",
-      "filename" : "Icon~ipad.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "72x72",
-      "idiom" : "ipad",
-      "filename" : "Icon~iPad@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
       "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-76.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-76@2x.png",
       "scale" : "2x"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "pre-rendered" : true
   }
 }
\ No newline at end of file
diff --git a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-60@2x.png b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-60@2x.png
new file mode 100644
index 0000000..509b373
Binary files /dev/null and b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-60@2x.png differ
diff --git a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-60@3x.png b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-60@3x.png
new file mode 100644
index 0000000..230b006
Binary files /dev/null and b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-60@3x.png differ
diff --git a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-76.png b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-76.png
new file mode 100644
index 0000000..84b76d4
Binary files /dev/null and b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-76.png differ
diff --git a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-76@2x.png b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-76@2x.png
new file mode 100644
index 0000000..5ed9ed9
Binary files /dev/null and b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-76@2x.png differ
diff --git a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small-40.png b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small-40.png
new file mode 100644
index 0000000..45d016f
Binary files /dev/null and b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small-40.png differ
diff --git a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small-40@2x-1.png b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small-40@2x-1.png
new file mode 100644
index 0000000..dbf0ca1
Binary files /dev/null and b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small-40@2x-1.png differ
diff --git a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
new file mode 100644
index 0000000..dbf0ca1
Binary files /dev/null and b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png differ
diff --git a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png
new file mode 100644
index 0000000..6315bc9
Binary files /dev/null and b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png differ
diff --git a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small.png b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small.png
new file mode 100644
index 0000000..61bd771
Binary files /dev/null and b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small.png differ
diff --git a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png
new file mode 100644
index 0000000..cd941b6
Binary files /dev/null and b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png differ
diff --git a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small@2x.png
new file mode 100644
index 0000000..cd941b6
Binary files /dev/null and b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small@2x.png differ
diff --git a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small@3x.png
new file mode 100644
index 0000000..5bac8cd
Binary files /dev/null and b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon-Small@3x.png differ
diff --git a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon.png b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon.png
deleted file mode 100644
index 1919ca6..0000000
Binary files a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon.png and /dev/null differ
diff --git a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon@2x.png b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon@2x.png
deleted file mode 100644
index 8d33d2d..0000000
Binary files a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon@2x.png and /dev/null differ
diff --git a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon~iPad@2x.png b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon~iPad@2x.png
deleted file mode 100644
index 7b10135..0000000
Binary files a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon~iPad@2x.png and /dev/null differ
diff --git a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon~ipad.png b/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon~ipad.png
deleted file mode 100644
index 6248db6..0000000
Binary files a/OpenSSL-for-iOS/Icons.xcassets/AppIcon.appiconset/Icon~ipad.png and /dev/null differ
diff --git a/OpenSSL-for-iOS/Icons.xcassets/LaunchImage.launchimage/Contents.json b/OpenSSL-for-iOS/Icons.xcassets/LaunchImage.launchimage/Contents.json
index 5a29666..af50ce3 100644
--- a/OpenSSL-for-iOS/Icons.xcassets/LaunchImage.launchimage/Contents.json
+++ b/OpenSSL-for-iOS/Icons.xcassets/LaunchImage.launchimage/Contents.json
@@ -1,45 +1,53 @@
 {
   "images" : [
     {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "736h",
+      "filename" : "Default-Portrait-736h@3x.png",
+      "minimum-system-version" : "8.0",
       "orientation" : "portrait",
-      "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
-      "extent" : "full-screen",
-      "scale" : "2x"
+      "scale" : "3x"
     },
     {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
-      "extent" : "full-screen",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "667h",
+      "filename" : "Default-667h@2x.png",
+      "minimum-system-version" : "8.0",
+      "orientation" : "portrait",
       "scale" : "2x"
     },
     {
       "orientation" : "portrait",
       "idiom" : "iphone",
+      "extent" : "full-screen",
       "minimum-system-version" : "7.0",
+      "filename" : "Default@2x.png",
       "scale" : "2x"
     },
     {
-      "orientation" : "portrait",
+      "extent" : "full-screen",
       "idiom" : "iphone",
-      "minimum-system-version" : "7.0",
       "subtype" : "retina4",
+      "filename" : "Default-568h@2x.png",
+      "minimum-system-version" : "7.0",
+      "orientation" : "portrait",
       "scale" : "2x"
     },
     {
       "orientation" : "portrait",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
       "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
     }
   ],
   "info" : {
diff --git a/OpenSSL-for-iOS/Icons.xcassets/LaunchImage.launchimage/Default-568h@2x.png b/OpenSSL-for-iOS/Icons.xcassets/LaunchImage.launchimage/Default-568h@2x.png
new file mode 100644
index 0000000..b164ded
Binary files /dev/null and b/OpenSSL-for-iOS/Icons.xcassets/LaunchImage.launchimage/Default-568h@2x.png differ
diff --git a/OpenSSL-for-iOS/Icons.xcassets/LaunchImage.launchimage/Default-667h@2x.png b/OpenSSL-for-iOS/Icons.xcassets/LaunchImage.launchimage/Default-667h@2x.png
new file mode 100644
index 0000000..651706f
Binary files /dev/null and b/OpenSSL-for-iOS/Icons.xcassets/LaunchImage.launchimage/Default-667h@2x.png differ
diff --git a/OpenSSL-for-iOS/Icons.xcassets/LaunchImage.launchimage/Default-Portrait-736h@3x.png b/OpenSSL-for-iOS/Icons.xcassets/LaunchImage.launchimage/Default-Portrait-736h@3x.png
new file mode 100644
index 0000000..2210caa
Binary files /dev/null and b/OpenSSL-for-iOS/Icons.xcassets/LaunchImage.launchimage/Default-Portrait-736h@3x.png differ
diff --git a/OpenSSL-for-iOS/Icons.xcassets/LaunchImage.launchimage/Default@2x.png b/OpenSSL-for-iOS/Icons.xcassets/LaunchImage.launchimage/Default@2x.png
new file mode 100644
index 0000000..47d377d
Binary files /dev/null and b/OpenSSL-for-iOS/Icons.xcassets/LaunchImage.launchimage/Default@2x.png differ
diff --git a/OpenSSL-for-iOS/OpenSSL-for-iOS-Info.plist b/OpenSSL-for-iOS/OpenSSL-for-iOS-Info.plist
index 10f0c12..18b5b74 100644
--- a/OpenSSL-for-iOS/OpenSSL-for-iOS-Info.plist
+++ b/OpenSSL-for-iOS/OpenSSL-for-iOS-Info.plist
@@ -21,11 +21,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0</string>
+	<string>3.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.0</string>
+	<string>3.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationExitsOnSuspend</key>
@@ -43,6 +43,9 @@
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 </dict>
 </plist>
diff --git a/OpenSSL-for-iOS/ViewController.m b/OpenSSL-for-iOS/ViewController.m
index 6a35a68..6e9fb63 100644
--- a/OpenSSL-for-iOS/ViewController.m
+++ b/OpenSSL-for-iOS/ViewController.m
@@ -37,7 +37,7 @@
 
 - (IBAction)showInfo 
 {	
-    NSString *message = [NSString stringWithFormat:@"OpenSSL-Version: %@\nLicense: See include/LICENSE\n\nCopyright 2010-2013 by Felix Schulze\n http://www.felixschulze.de", @OPENSSL_VERSION_TEXT];
+    NSString *message = [NSString stringWithFormat:@"OpenSSL-Version: %@\nLicense: See include/LICENSE\n\nCopyright 2010-2015 by Felix Schulze\n http://www.felixschulze.de", @OPENSSL_VERSION_TEXT];
 	UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"OpenSSL-for-iOS" message:message delegate:nil cancelButtonTitle:@"Close" otherButtonTitles:nil];	
 	[alert show];
 }
diff --git a/OpenSSL-for-iOS/en.lproj/ViewController_iPhone.xib b/OpenSSL-for-iOS/en.lproj/ViewController.xib
similarity index 50%
rename from OpenSSL-for-iOS/en.lproj/ViewController_iPhone.xib
rename to OpenSSL-for-iOS/en.lproj/ViewController.xib
index 4da2b84..492d43e 100644
--- a/OpenSSL-for-iOS/en.lproj/ViewController_iPhone.xib
+++ b/OpenSSL-for-iOS/en.lproj/ViewController.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4511" systemVersion="13A598" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment defaultVersion="1792" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3745"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ViewController">
@@ -18,16 +18,14 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="SHA256-Hash:" lineBreakMode="tailTruncation" minimumFontSize="10" id="32">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="SHA256-Hash:" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="32">
                     <rect key="frame" x="19" y="298" width="115" height="21"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                     <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                 </label>
-                <navigationBar contentMode="scaleToFill" id="33">
+                <navigationBar contentMode="scaleToFill" translucent="NO" translatesAutoresizingMaskIntoConstraints="NO" id="33">
                     <rect key="frame" x="0.0" y="20" width="320" height="44"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                     <items>
                         <navigationItem title="OpenSSL-for-iOS" id="41">
                             <barButtonItem key="rightBarButtonItem" id="42">
@@ -50,9 +48,8 @@
                         </navigationItem>
                     </items>
                 </navigationBar>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="34">
-                    <rect key="frame" x="19" y="142" width="286" height="35"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="34">
+                    <rect key="frame" x="19" y="142" width="282" height="30"/>
                     <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
                     <state key="normal" title="Calculate MD5">
                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -61,43 +58,43 @@
                         <action selector="calculateMD5:" destination="-1" eventType="touchDown" id="47"/>
                     </connections>
                 </button>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="MD5-Hash:" lineBreakMode="tailTruncation" minimumFontSize="10" id="35">
-                    <rect key="frame" x="19" y="230" width="87" height="21"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="MD5-Hash:" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="35">
+                    <rect key="frame" x="19" y="230" width="282" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                     <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                 </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="" lineBreakMode="tailTruncation" minimumFontSize="10" id="36">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="36">
                     <rect key="frame" x="20" y="259" width="285" height="31"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="31" id="NFv-MT-xiJ"/>
+                    </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                     <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                 </label>
-                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="Enter an Text here" borderStyle="roundedRect" minimumFontSize="17" id="37">
-                    <rect key="frame" x="19" y="103" width="286" height="31"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="Enter an Text here" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="37">
+                    <rect key="frame" x="19" y="103" width="286" height="30"/>
                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                     <textInputTraits key="textInputTraits"/>
                 </textField>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="" lineBreakMode="tailTruncation" numberOfLines="3" minimumFontSize="10" id="38">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="" lineBreakMode="tailTruncation" numberOfLines="3" minimumFontSize="10" preferredMaxLayoutWidth="286" translatesAutoresizingMaskIntoConstraints="NO" id="38">
                     <rect key="frame" x="19" y="327" width="286" height="62"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="62" id="Mzu-Rf-gIS"/>
+                    </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                     <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                 </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Text:" lineBreakMode="tailTruncation" minimumFontSize="10" id="39">
-                    <rect key="frame" x="19" y="74" width="42" height="21"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Text:" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="39">
+                    <rect key="frame" x="19" y="74" width="291" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                     <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                 </label>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="40">
-                    <rect key="frame" x="19" y="185" width="286" height="37"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="40">
+                    <rect key="frame" x="19" y="185" width="282" height="30"/>
                     <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
                     <state key="normal" title="Calculate SHA256">
                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -108,7 +105,44 @@
                 </button>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-            <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
+            <constraints>
+                <constraint firstItem="39" firstAttribute="top" secondItem="33" secondAttribute="bottom" constant="10" id="1BI-aY-9IL"/>
+                <constraint firstItem="34" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="19" id="9Si-AP-ujc"/>
+                <constraint firstItem="33" firstAttribute="top" secondItem="6" secondAttribute="top" constant="20" id="APT-3I-FbY"/>
+                <constraint firstItem="37" firstAttribute="top" secondItem="39" secondAttribute="bottom" constant="8" id="DY2-fM-vja"/>
+                <constraint firstAttribute="trailing" secondItem="39" secondAttribute="trailing" constant="10" id="E5l-9t-8ub"/>
+                <constraint firstAttribute="trailing" secondItem="38" secondAttribute="trailing" constant="15" id="FDW-g2-HAY"/>
+                <constraint firstAttribute="trailing" secondItem="37" secondAttribute="trailing" constant="15" id="Fdz-7s-qS8"/>
+                <constraint firstItem="39" firstAttribute="top" secondItem="33" secondAttribute="bottom" constant="10" id="FrT-O7-kcV"/>
+                <constraint firstItem="37" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="19" id="Frd-IC-wkx"/>
+                <constraint firstAttribute="trailing" secondItem="34" secondAttribute="trailing" constant="19" id="Kaz-5b-hGg"/>
+                <constraint firstItem="33" firstAttribute="leading" secondItem="6" secondAttribute="leading" id="Kg3-AW-whn"/>
+                <constraint firstItem="40" firstAttribute="top" secondItem="34" secondAttribute="bottom" constant="13" id="MuK-nL-h9r"/>
+                <constraint firstAttribute="trailing" secondItem="40" secondAttribute="trailing" constant="19" id="OCL-4J-Afe"/>
+                <constraint firstItem="32" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="19" id="Qhw-U6-ddG"/>
+                <constraint firstAttribute="trailing" secondItem="36" secondAttribute="trailing" constant="15" id="Rvx-aO-gN3"/>
+                <constraint firstItem="36" firstAttribute="top" secondItem="35" secondAttribute="bottom" constant="8" id="Sbh-yp-0nU"/>
+                <constraint firstItem="39" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="19" id="T5B-5h-q8D"/>
+                <constraint firstItem="38" firstAttribute="top" secondItem="32" secondAttribute="bottom" constant="8" id="V13-2M-nQL"/>
+                <constraint firstAttribute="trailing" secondItem="33" secondAttribute="trailing" id="YVQ-uh-xT0"/>
+                <constraint firstItem="32" firstAttribute="top" secondItem="36" secondAttribute="bottom" constant="8" id="c8h-oI-R7k"/>
+                <constraint firstAttribute="trailing" secondItem="32" secondAttribute="trailing" constant="186" id="cjr-lK-8r8"/>
+                <constraint firstItem="36" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="20" id="fu0-sJ-lpg"/>
+                <constraint firstItem="38" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="19" id="kvt-2f-KaA"/>
+                <constraint firstItem="35" firstAttribute="top" secondItem="40" secondAttribute="bottom" constant="15" id="mgw-q7-EJV"/>
+                <constraint firstItem="34" firstAttribute="top" secondItem="37" secondAttribute="bottom" constant="9" id="qjY-Mb-DC0"/>
+                <constraint firstItem="38" firstAttribute="top" secondItem="32" secondAttribute="bottom" constant="8" id="upF-NZ-nEv"/>
+                <constraint firstItem="35" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="19" id="vKV-5k-hyL"/>
+                <constraint firstItem="40" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="19" id="wwh-gr-08J"/>
+                <constraint firstAttribute="trailing" secondItem="35" secondAttribute="trailing" constant="19" id="yfT-nP-QM6"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="444" y="580"/>
         </view>
     </objects>
-</document>
\ No newline at end of file
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination" type="retina4"/>
+    </simulatedMetricsContainer>
+</document>
diff --git a/OpenSSL-for-iOS/en.lproj/ViewController_iPad.xib b/OpenSSL-for-iOS/en.lproj/ViewController_iPad.xib
deleted file mode 100644
index f474265..0000000
--- a/OpenSSL-for-iOS/en.lproj/ViewController_iPad.xib
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="4511" systemVersion="13A598" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
-    <dependencies>
-        <deployment defaultVersion="1792" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3745"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ViewController">
-            <connections>
-                <outlet property="md5TextField" destination="4" id="16"/>
-                <outlet property="sha256TextField" destination="11" id="17"/>
-                <outlet property="textField" destination="8" id="18"/>
-                <outlet property="view" destination="2" id="3"/>
-            </connections>
-        </placeholder>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="2">
-            <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="" lineBreakMode="tailTruncation" minimumFontSize="10" id="4">
-                    <rect key="frame" x="20" y="259" width="728" height="31"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Text:" lineBreakMode="tailTruncation" minimumFontSize="10" id="5">
-                    <rect key="frame" x="19" y="74" width="42" height="21"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="SHA256-Hash:" lineBreakMode="tailTruncation" minimumFontSize="10" id="6">
-                    <rect key="frame" x="19" y="298" width="729" height="21"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                </label>
-                <navigationBar contentMode="scaleToFill" id="7">
-                    <rect key="frame" x="0.0" y="20" width="768" height="44"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                    <items>
-                        <navigationItem title="OpenSSL-for-iOS" id="13">
-                            <barButtonItem key="rightBarButtonItem" id="14">
-                                <button key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="infoLight" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="15">
-                                    <rect key="frame" x="730" y="11" width="22" height="22"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                    <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
-                                    <state key="normal">
-                                        <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                    </state>
-                                    <state key="highlighted">
-                                        <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                    </state>
-                                    <connections>
-                                        <action selector="showInfo" destination="-1" eventType="touchDown" id="21"/>
-                                    </connections>
-                                </button>
-                            </barButtonItem>
-                        </navigationItem>
-                    </items>
-                </navigationBar>
-                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="Enter an Text here" borderStyle="roundedRect" minimumFontSize="17" id="8">
-                    <rect key="frame" x="19" y="103" width="729" height="31"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                    <textInputTraits key="textInputTraits"/>
-                </textField>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="MD5-Hash:" lineBreakMode="tailTruncation" minimumFontSize="10" id="9">
-                    <rect key="frame" x="19" y="230" width="729" height="21"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                </label>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="10">
-                    <rect key="frame" x="19" y="142" width="729" height="35"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
-                    <state key="normal" title="Calculate MD5">
-                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                    </state>
-                    <connections>
-                        <action selector="calculateMD5:" destination="-1" eventType="touchDown" id="19"/>
-                    </connections>
-                </button>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="" lineBreakMode="tailTruncation" numberOfLines="3" minimumFontSize="10" id="11">
-                    <rect key="frame" x="19" y="327" width="729" height="62"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                </label>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="12">
-                    <rect key="frame" x="19" y="185" width="729" height="37"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
-                    <state key="normal" title="Calculate SHA256">
-                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                    </state>
-                    <connections>
-                        <action selector="calculateSHA256:" destination="-1" eventType="touchDown" id="20"/>
-                    </connections>
-                </button>
-            </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-            <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
-        </view>
-    </objects>
-</document>
\ No newline at end of file
diff --git a/README.md b/README.md
index e05ac62..4410e6f 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ You must build the OpenSSL-Libraries before running the sample with:
 This repository contains a iOS 8.0 XCode Project with usese the OpenSSL Libaries. The examples uses the MD5 or SHA256-algorithm to calculate an md5 or sha256 hash from an UITextfield.
 
 ## System support
-**iOS 4.3 - iOS 8.1 (i386, x86_64, armv7, armv7s, armv64) is currently supported.**
+**iOS 4.3 - iOS 8.3 (i386, x86_64, armv7, armv7s, armv64) is currently supported.**
 
 For iOS < 4.3 you must use iOS SDK < 6.0 and an older version of the build script.
 
@@ -23,7 +23,7 @@ If you have problems building for arm64 please uninstall MacPorts (see #28).
 * <http://www.x2on.de/2010/07/13/tutorial-iphone-app-with-compiled-openssl-1-0-0a-library/>
 
 ## Changelog
-* 2015-06-15: OpenSSL 1.0.2c
+* 2015-06-15: OpenSSL 1.0.2c, iOS 8.3
 * 2015-06-11: OpenSSL 1.0.2b
 * 2015-03-19: OpenSSL 1.0.2a
 * 2015-01-28: OpenSSL 1.0.2
diff --git a/build-libssl.sh b/build-libssl.sh
index 6b73d22..c861d4e 100755
--- a/build-libssl.sh
+++ b/build-libssl.sh
@@ -4,7 +4,7 @@
 #  for iPhoneOS and iPhoneSimulator
 #
 #  Created by Felix Schulze on 16.12.10.
-#  Copyright 2010 Felix Schulze. All rights reserved.
+#  Copyright 2010-2015 Felix Schulze. All rights reserved.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.