diff --git a/#.gitignore# b/#.gitignore#
new file mode 100644
index 0000000..14b883a
--- /dev/null
+++ b/#.gitignore#
@@ -0,0 +1,61 @@
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Eclipse ignores
+
+*.pydevproject
+.metadata
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+engineering+team@kissmetrics.comengineering+team@kissmetrics.comengineering+team@kissmetrics.comengineering+team@kissmetrics.com.texlipse
+
+# Intellij
+.idea/
+*.iml
+
+*.jar
+*.tar.gz
+*.tar.bz
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 70f8481..e22f788 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,4 +58,6 @@ tmp/
 
 *.jar
 *.tar.gz
-*.tar.bz
\ No newline at end of file
+*.tar.bz
+
+.DS_Store
diff --git a/README.md b/README.md
index ccf240b..86543dd 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ your `build.gradle`:
 
 ```groovy
 dependencies {
-  compile 'com.kissmetrics.sdk:KISSmetricsSDK:2.3.0'
+  compile 'com.kissmetrics.sdk:KISSmetricsSDK:2.3.1'
 }
 ```
 
diff --git a/build.gradle b/build.gradle
index 747066e..290ed98 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,28 +1,36 @@
 buildscript {
   repositories {
+    google()
     jcenter()
     mavenCentral()
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:1.1.+'
-    classpath 'com.github.dcendents:android-maven-plugin:1.2'
+    classpath "com.android.tools.build:gradle:4.0.1"
+    classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
   }
 
-  version '2.3.0'
+  version '2.3.1'
   group 'com.kissmetrics.sdk'
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+
+allprojects {
+  repositories {
+    google()
+    jcenter()
+  }
+}
 
 android {
-  compileSdkVersion 8
-  buildToolsVersion "22.0.1"
+  compileSdkVersion 26
 
   defaultConfig {
     minSdkVersion 8
-    targetSdkVersion 22
-    versionCode 4
+    targetSdkVersion 26
+    versionCode 5
     versionName project.version
   }
 
@@ -48,18 +56,9 @@ android {
   }
 }
 
-repositories {
-  jcenter()
-}
-
-apply plugin: "com.github.dcendents.android-maven"
-
 dependencies {
-  androidTestCompile group: 'com.android.support.test', name: 'testing-support-lib', version: '+'
-}
-
-task wrapper(type: org.gradle.api.tasks.wrapper.Wrapper) {
-  gradleVersion = '2.3'
+  androidTestImplementation group: 'com.android.support.test', name: 'testing-support-lib', version: '0.1'
+  testImplementation 'junit:junit:4.12'
 }
 
 // Take from
@@ -80,19 +79,18 @@ android.libraryVariants.all { variant ->
 // This magic came from:
 // http://stackoverflow.com/questions/23297562/gradle-javadoc-and-android-documentation
 task javadocs(type: Javadoc) {
-  title = "KISSmetrics Android API ${android.defaultConfig.versionName}"
-  description = 'Documentation for the KISSmetrics Android API'
-
-  def variant = android.libraryVariants.release
-  source = android.sourceSets.main.java.srcDirs
-  classpath = files(variant.javaCompile.classpath.files, project.android.getBootClasspath())
-  options {
-    links "http://docs.oracle.com/javase/7/docs/api/"
-    linksOffline "http://d.android.com/reference","${android.sdkDirectory}/docs/reference"
+  android.libraryVariants.all { variant ->
+    title = "KISSmetrics Android API ${android.defaultConfig.versionName}"
+    source = android.sourceSets.main.java.srcDirs
+    classpath = files(variant.javaCompile.classpath.files, project.android.getBootClasspath())
+//    options {
+//      links "http://docs.oracle.com/javase/7/docs/api/"
+//      linksOffline "http://d.android.com/reference", "${android.sdkDirectory}/docs/reference"
+//    }
+
+    exclude '**/BuildConfig.java'
+    exclude '**/R.java'
   }
-
-  exclude '**/BuildConfig.java'
-  exclude '**/R.java'
 }
 
 task sourcesJar(type: Jar) {
@@ -103,4 +101,4 @@ task sourcesJar(type: Jar) {
 task javadocsJar(type: Jar, dependsOn: javadocs) {
   classifier 'javadoc'
   from "${project.buildDir}/docs/javadoc"
-}
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..a4b4429
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..cccdd3d
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..e95643d
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/releasing.md b/releasing.md
index fc2ae54..605148c 100644
--- a/releasing.md
+++ b/releasing.md
@@ -69,9 +69,9 @@ to do a little more work.  First generate the pom file:
 gradle install
 ```
 
-The `KISSmetricsSDK-2.3.0.pom` file will be placed under
+The `KISSmetricsSDK-2.3.1.pom` file will be placed under
 `~/.m2/repository/com/kissmetrics/sdk/KISSmetricsSDK/$VERSION` where `$VERSION` is
-the new version number (i.e. 2.3.0).
+the new version number (i.e. 2.3.1).
 
 Create a new version of the package in Bintray.  Upload the files in Step 4 and
-`KISSmetricsSDK-2.3.0.pom` to Bintray.
+`KISSmetricsSDK-2.3.1.pom` to Bintray.
diff --git a/src/androidTest/java/com/kissmetrics/sdk/ConnectionImplTest.java b/src/androidTest/java/com/kissmetrics/sdk/ConnectionImplTest.java
index 1c0dffe..aa66401 100644
--- a/src/androidTest/java/com/kissmetrics/sdk/ConnectionImplTest.java
+++ b/src/androidTest/java/com/kissmetrics/sdk/ConnectionImplTest.java
@@ -147,7 +147,7 @@ public final void testMalformedURL() {
     ConnectionImpl connectionImpl = new ConnectionImpl();
 
     // Method under test
-    connectionImpl.sendRecord("https://www.kissmetrics.io", this);
+    connectionImpl.sendRecord("htt.ps://www.kissmetrics.io", this);
 
     // Assert values returned via callback
     assertEquals("A malformedURL is not successful", false, resultSuccess);
diff --git a/src/androidTest/java/com/kissmetrics/sdk/VerificationImplTest.java b/src/androidTest/java/com/kissmetrics/sdk/VerificationImplTest.java
index b04f668..d98780c 100644
--- a/src/androidTest/java/com/kissmetrics/sdk/VerificationImplTest.java
+++ b/src/androidTest/java/com/kissmetrics/sdk/VerificationImplTest.java
@@ -160,24 +160,6 @@ public final void testVerificationResponseTrackingTrue() {
     assertEquals("Receives expected expiration from headers", expectedExpirationDate, resultExpirationDate);
   }
 
-  public final void testMalformedURL() {
-    resultSuccess = true;
-    resultDoTrack = false;
-    resultBaseUrl = "";
-    resultExpirationDate = 999999999L;
-
-    // No need to mock for malformedURL
-    VerificationImpl verificationImpl = new VerificationImpl();
-
-    // Method under test
-    verificationImpl.verifyTracking("://&%^#$^%#&*%^#", "INSTALLUUIDSHOULDNTMATTER", this);
-
-    // Assert values returned via callback
-    assertEquals("A malformedURL is not successful", false, resultSuccess);
-    assertEquals("A malformedURL does allow tracking", true, resultDoTrack);
-    assertEquals("A malformedURL sets expiration date to 0", 0L, resultExpirationDate);
-  }
-
   // VerificationImpl uses a callback to return results.
   // Pickup the completion callback here and record the results.
   // We'll check these values as part of each test.
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index f108cca..f96f283 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.kissmetrics.sdk">
 
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="22"/>
-
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>
\ No newline at end of file
diff --git a/src/main/java/com/kissmetrics/sdk/Connection.java b/src/main/java/com/kissmetrics/sdk/Connection.java
index e47ef60..a3da18d 100644
--- a/src/main/java/com/kissmetrics/sdk/Connection.java
+++ b/src/main/java/com/kissmetrics/sdk/Connection.java
@@ -21,7 +21,7 @@
  * Connection interface
  */
 interface Connection {
-  public static final String USER_AGENT = "KISSmetrics-Android/2.3.0";
+  public static final String USER_AGENT = "KISSmetrics-Android/2.3.1";
 
   /**
    * Makes a request to the provided API query urlString.
diff --git a/src/main/java/com/kissmetrics/sdk/KISSmetricsAPI.java b/src/main/java/com/kissmetrics/sdk/KISSmetricsAPI.java
index 59621c1..e1cd419 100644
--- a/src/main/java/com/kissmetrics/sdk/KISSmetricsAPI.java
+++ b/src/main/java/com/kissmetrics/sdk/KISSmetricsAPI.java
@@ -504,7 +504,7 @@ public void recordOnce(String name) {
 
   /**
    * @param properties User properties
-   * @deprecated use {@link #set(java.util.Map)} instead. <tt>setProperties</tt> method name
+   * @deprecated use {@link #set(java.util.Map)} instead. <code>setProperties</code> method name
    * has been changed to 'set' for consistency across our various APIs.
    */
   @Deprecated