diff --git a/src/android/com/synconset/CordovaHTTP/HttpRequest.java b/src/android/com/synconset/CordovaHTTP/HttpRequest.java
index 3bb642d..8016504 100644
--- a/src/android/com/synconset/CordovaHTTP/HttpRequest.java
+++ b/src/android/com/synconset/CordovaHTTP/HttpRequest.java
@@ -305,7 +305,12 @@ public class HttpRequest {
       try {
         SSLContext context = SSLContext.getInstance("TLS");
         context.init(null, trustAllCerts, new SecureRandom());
-        TRUSTED_FACTORY = new TLSSocketFactory(context);
+        
+        if (android.os.Build.VERSION.SDK_INT < 20) {
+          TRUSTED_FACTORY = new TLSSocketFactory(context);
+        } else {
+          TRUSTED_FACTORY = context.getSocketFactory();
+        }
       } catch (GeneralSecurityException e) {
         IOException ioException = new IOException(
             "Security exception configuring SSL context");
@@ -436,7 +441,7 @@ public class HttpRequest {
   */
   public static void addCert(Certificate ca) throws GeneralSecurityException, IOException  {
       if (PINNED_CERTS == null) {
-          PINNED_CERTS = new ArrayList<Certificate>();
+        PINNED_CERTS = new ArrayList<Certificate>();
       }
       PINNED_CERTS.add(ca);
       String keyStoreType = KeyStore.getDefaultType();
@@ -444,7 +449,7 @@ public class HttpRequest {
       keyStore.load(null, null);
       
       for (int i = 0; i < PINNED_CERTS.size(); i++) {
-          keyStore.setCertificateEntry("CA" + i, PINNED_CERTS.get(i));
+        keyStore.setCertificateEntry("CA" + i, PINNED_CERTS.get(i));
       }
       
       // Create a TrustManager that trusts the CAs in our KeyStore
@@ -455,7 +460,12 @@ public class HttpRequest {
       // Create an SSLContext that uses our TrustManager
       SSLContext sslContext = SSLContext.getInstance("TLS");
       sslContext.init(null, tmf.getTrustManagers(), null);
-      PINNED_FACTORY = new TLSSocketFactory(sslContext);
+      
+      if (android.os.Build.VERSION.SDK_INT < 20) {
+        PINNED_FACTORY = new TLSSocketFactory(sslContext);
+      } else {
+        PINNED_FACTORY = sslContext.getSocketFactory();
+      }
   }
   
   /**
diff --git a/src/android/com/synconset/CordovaHTTP/TLSSocketFactory.java b/src/android/com/synconset/CordovaHTTP/TLSSocketFactory.java
index b8806df..8d3170f 100644
--- a/src/android/com/synconset/CordovaHTTP/TLSSocketFactory.java
+++ b/src/android/com/synconset/CordovaHTTP/TLSSocketFactory.java
@@ -56,7 +56,7 @@ public class TLSSocketFactory extends SSLSocketFactory {
 
     private Socket enableTLSOnSocket(Socket socket) {
         if(socket != null && (socket instanceof SSLSocket)) {
-            ((SSLSocket)socket).setEnabledProtocols(new String[] {"TLSv1.1", "TLSv1.2"});
+            ((SSLSocket)socket).setEnabledProtocols(new String[] {"TLSv1", "TLSv1.1", "TLSv1.2"});
         }
         return socket;
     }
diff --git a/zedconfig.json b/zedconfig.json
index 3f52390..e6a16fa 100644
--- a/zedconfig.json
+++ b/zedconfig.json
@@ -1,6 +1,6 @@
 {
     "preferences": {
-        "tabSize": 4,
+        "tabSize": 2,
         "wordWrap": true,
         "useSoftTabs": true,
         "gotoExclude": []