diff --git a/LICENSE.md b/LICENSE.md
index da63eed7..f3abe5c6 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2016 Patches Klinefelter
+   Copyright 2017 Patches Klinefelter
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index c0803e99..b4c2a80f 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ Then add it as a dependency:
 Gradle:
 
 ```
-compile 'com.isupatches:wisefy:1.0.6'
+compile 'com.isupatches:wisefy:1.0.7'
 ```
 
 Maven:
@@ -50,7 +50,7 @@ Maven:
 <dependency>
   <groupId>com.isupatches</groupId>
   <artifactId>wisefy</artifactId>
-  <version>1.0.6</version>
+  <version>1.0.7</version>
   <type>pom</type>
 </dependency>
 ```
@@ -231,7 +231,7 @@ String ssid = mWiseFy.searchForSSID("SSID To Search For", 30000);
 ```
 
 ## License ##
-Copyright 2016 Patches Klinefelter
+Copyright 2017 Patches Klinefelter
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
 compliance with the License. You may obtain a copy of the License at
diff --git a/build.gradle b/build.gradle
index 6d5eeacc..1bfd7e73 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,8 +6,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
-        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.2'
+        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.3'
         classpath "com.github.dcendents:android-maven-gradle-plugin:1.5"
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath "org.jacoco:org.jacoco.core:0.7.8"
@@ -46,7 +46,7 @@ subprojects {
 
 ext {
     GROUP = "com.isupatches"
-    VERSION_NAME = "1.0.6"
+    VERSION_NAME = "1.0.7"
 
     BINTRAY_REPO = "Maven"
     BINTRAY_NAME = "wisefy"
diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle
new file mode 100644
index 00000000..6c0e533b
--- /dev/null
+++ b/gradle/jacoco.gradle
@@ -0,0 +1,35 @@
+apply plugin: 'jacoco'
+
+def coverageSourceDirs = [
+        '../wisefy/src/main/java'
+]
+
+def classDirs = fileTree(
+        dir: '../wisefy/build/intermediates/classes/debug/com/',
+        excludes: ['**/R.class',
+                   '**/R$*.class',
+                   '**/*$ViewBinder*.*',
+                   '**/*MembersInjector*.*',
+                   '**/BuildConfig.*',
+                   '**/Manifest*.*',
+                   '**/*$Lambda$*.class',
+                   '**/*Factory*.class',
+                   '**/*$Builder*'])
+
+task jacocoDebugTestReport(type: JacocoReport, dependsOn: ["connectedDebugAndroidTest"]) {
+    group = "Reporting"
+    description = "Generate Jacoco coverage report for debug tests"
+    classDirectories = classDirs
+    additionalSourceDirs = files(coverageSourceDirs)
+    sourceDirectories = files(coverageSourceDirs)
+    executionData = files([fileTree(dir: 'build/outputs/code-coverage/connected', include: '**/*.ec')])
+
+    onlyIf = {
+        true
+    }
+
+    reports {
+        xml.enabled = true
+        html.enabled = true
+    }
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 3baa851b..6bbd0019 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3023e1c5..8c2272b3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Feb 04 20:20:36 CST 2017
+#Sat Mar 25 21:27:42 CDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip
diff --git a/gradlew b/gradlew
index 27309d92..4453ccea 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# 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
index f6d5974e..e95643d6 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
diff --git a/javadoc/allclasses-frame.html b/javadoc/allclasses-frame.html
index d609a97e..e917f75b 100644
--- a/javadoc/allclasses-frame.html
+++ b/javadoc/allclasses-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>All Classes (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>All Classes (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/javadoc/allclasses-noframe.html b/javadoc/allclasses-noframe.html
index f9e7d869..573c635e 100644
--- a/javadoc/allclasses-noframe.html
+++ b/javadoc/allclasses-noframe.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>All Classes (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>All Classes (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/javadoc/com/isupatches/wisefy/WiseFy.html b/javadoc/com/isupatches/wisefy/WiseFy.html
index 30531356..8dd27dfb 100644
--- a/javadoc/com/isupatches/wisefy/WiseFy.html
+++ b/javadoc/com/isupatches/wisefy/WiseFy.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>WiseFy (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>WiseFy (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="WiseFy (wisefy 1.0.6 API)";
+            parent.document.title="WiseFy (wisefy 1.0.7 API)";
         }
     }
     catch(err) {
diff --git a/javadoc/com/isupatches/wisefy/WiseFy.withContext.html b/javadoc/com/isupatches/wisefy/WiseFy.withContext.html
index af51b095..7ae69c36 100644
--- a/javadoc/com/isupatches/wisefy/WiseFy.withContext.html
+++ b/javadoc/com/isupatches/wisefy/WiseFy.withContext.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>WiseFy.withContext (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>WiseFy.withContext (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="WiseFy.withContext (wisefy 1.0.6 API)";
+            parent.document.title="WiseFy.withContext (wisefy 1.0.7 API)";
         }
     }
     catch(err) {
diff --git a/javadoc/com/isupatches/wisefy/package-frame.html b/javadoc/com/isupatches/wisefy/package-frame.html
index 64e42fa1..a77fbd59 100644
--- a/javadoc/com/isupatches/wisefy/package-frame.html
+++ b/javadoc/com/isupatches/wisefy/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>com.isupatches.wisefy (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>com.isupatches.wisefy (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
diff --git a/javadoc/com/isupatches/wisefy/package-summary.html b/javadoc/com/isupatches/wisefy/package-summary.html
index 9a00eaa5..42705602 100644
--- a/javadoc/com/isupatches/wisefy/package-summary.html
+++ b/javadoc/com/isupatches/wisefy/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>com.isupatches.wisefy (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>com.isupatches.wisefy (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.isupatches.wisefy (wisefy 1.0.6 API)";
+            parent.document.title="com.isupatches.wisefy (wisefy 1.0.7 API)";
         }
     }
     catch(err) {
diff --git a/javadoc/com/isupatches/wisefy/package-tree.html b/javadoc/com/isupatches/wisefy/package-tree.html
index 649017e3..ab6d4c6b 100644
--- a/javadoc/com/isupatches/wisefy/package-tree.html
+++ b/javadoc/com/isupatches/wisefy/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>com.isupatches.wisefy Class Hierarchy (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>com.isupatches.wisefy Class Hierarchy (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.isupatches.wisefy Class Hierarchy (wisefy 1.0.6 API)";
+            parent.document.title="com.isupatches.wisefy Class Hierarchy (wisefy 1.0.7 API)";
         }
     }
     catch(err) {
diff --git a/javadoc/com/isupatches/wisefy/util/GetManagerUtil.html b/javadoc/com/isupatches/wisefy/util/GetManagerUtil.html
index 435a7145..1d35af9d 100644
--- a/javadoc/com/isupatches/wisefy/util/GetManagerUtil.html
+++ b/javadoc/com/isupatches/wisefy/util/GetManagerUtil.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>GetManagerUtil (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>GetManagerUtil (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="GetManagerUtil (wisefy 1.0.6 API)";
+            parent.document.title="GetManagerUtil (wisefy 1.0.7 API)";
         }
     }
     catch(err) {
diff --git a/javadoc/com/isupatches/wisefy/util/LogUtil.html b/javadoc/com/isupatches/wisefy/util/LogUtil.html
index 5a17216e..1cebb2d8 100644
--- a/javadoc/com/isupatches/wisefy/util/LogUtil.html
+++ b/javadoc/com/isupatches/wisefy/util/LogUtil.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>LogUtil (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>LogUtil (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="LogUtil (wisefy 1.0.6 API)";
+            parent.document.title="LogUtil (wisefy 1.0.7 API)";
         }
     }
     catch(err) {
diff --git a/javadoc/com/isupatches/wisefy/util/SSIDUtil.html b/javadoc/com/isupatches/wisefy/util/SSIDUtil.html
index 6f20be50..3f1cfab8 100644
--- a/javadoc/com/isupatches/wisefy/util/SSIDUtil.html
+++ b/javadoc/com/isupatches/wisefy/util/SSIDUtil.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>SSIDUtil (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>SSIDUtil (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SSIDUtil (wisefy 1.0.6 API)";
+            parent.document.title="SSIDUtil (wisefy 1.0.7 API)";
         }
     }
     catch(err) {
diff --git a/javadoc/com/isupatches/wisefy/util/package-frame.html b/javadoc/com/isupatches/wisefy/util/package-frame.html
index 5592a6e3..53b23d0f 100644
--- a/javadoc/com/isupatches/wisefy/util/package-frame.html
+++ b/javadoc/com/isupatches/wisefy/util/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>com.isupatches.wisefy.util (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>com.isupatches.wisefy.util (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
diff --git a/javadoc/com/isupatches/wisefy/util/package-summary.html b/javadoc/com/isupatches/wisefy/util/package-summary.html
index ab197a29..f570985e 100644
--- a/javadoc/com/isupatches/wisefy/util/package-summary.html
+++ b/javadoc/com/isupatches/wisefy/util/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>com.isupatches.wisefy.util (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>com.isupatches.wisefy.util (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.isupatches.wisefy.util (wisefy 1.0.6 API)";
+            parent.document.title="com.isupatches.wisefy.util (wisefy 1.0.7 API)";
         }
     }
     catch(err) {
diff --git a/javadoc/com/isupatches/wisefy/util/package-tree.html b/javadoc/com/isupatches/wisefy/util/package-tree.html
index d924d109..22731fe0 100644
--- a/javadoc/com/isupatches/wisefy/util/package-tree.html
+++ b/javadoc/com/isupatches/wisefy/util/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>com.isupatches.wisefy.util Class Hierarchy (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>com.isupatches.wisefy.util Class Hierarchy (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.isupatches.wisefy.util Class Hierarchy (wisefy 1.0.6 API)";
+            parent.document.title="com.isupatches.wisefy.util Class Hierarchy (wisefy 1.0.7 API)";
         }
     }
     catch(err) {
diff --git a/javadoc/constant-values.html b/javadoc/constant-values.html
index cf8b28bd..df6749ae 100644
--- a/javadoc/constant-values.html
+++ b/javadoc/constant-values.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>Constant Field Values (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>Constant Field Values (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (wisefy 1.0.6 API)";
+            parent.document.title="Constant Field Values (wisefy 1.0.7 API)";
         }
     }
     catch(err) {
diff --git a/javadoc/deprecated-list.html b/javadoc/deprecated-list.html
index e7547ed5..96c0d37c 100644
--- a/javadoc/deprecated-list.html
+++ b/javadoc/deprecated-list.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>Deprecated List (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>Deprecated List (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List (wisefy 1.0.6 API)";
+            parent.document.title="Deprecated List (wisefy 1.0.7 API)";
         }
     }
     catch(err) {
diff --git a/javadoc/help-doc.html b/javadoc/help-doc.html
index b6ac6c40..2484fd01 100644
--- a/javadoc/help-doc.html
+++ b/javadoc/help-doc.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>API Help (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>API Help (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help (wisefy 1.0.6 API)";
+            parent.document.title="API Help (wisefy 1.0.7 API)";
         }
     }
     catch(err) {
diff --git a/javadoc/index-all.html b/javadoc/index-all.html
index c2b89b12..a7517a59 100644
--- a/javadoc/index-all.html
+++ b/javadoc/index-all.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>Index (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>Index (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Index (wisefy 1.0.6 API)";
+            parent.document.title="Index (wisefy 1.0.7 API)";
         }
     }
     catch(err) {
diff --git a/javadoc/index.html b/javadoc/index.html
index 46ae10f5..8b9623fd 100644
--- a/javadoc/index.html
+++ b/javadoc/index.html
@@ -2,8 +2,8 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>wisefy 1.0.6 API</title>
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>wisefy 1.0.7 API</title>
 <script type="text/javascript">
     targetPage = "" + window.location.search;
     if (targetPage != "" && targetPage != "undefined")
diff --git a/javadoc/overview-frame.html b/javadoc/overview-frame.html
index fced8898..f7ca9564 100644
--- a/javadoc/overview-frame.html
+++ b/javadoc/overview-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>Overview List (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>Overview List (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/javadoc/overview-summary.html b/javadoc/overview-summary.html
index 179f58a8..0c819377 100644
--- a/javadoc/overview-summary.html
+++ b/javadoc/overview-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>Overview (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>Overview (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Overview (wisefy 1.0.6 API)";
+            parent.document.title="Overview (wisefy 1.0.7 API)";
         }
     }
     catch(err) {
@@ -69,7 +69,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title">wisefy 1.0.6 API</h1>
+<h1 class="title">wisefy 1.0.7 API</h1>
 </div>
 <div class="contentContainer">
 <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Packages table, listing packages, and an explanation">
diff --git a/javadoc/overview-tree.html b/javadoc/overview-tree.html
index 1e18c0dd..5c26241a 100644
--- a/javadoc/overview-tree.html
+++ b/javadoc/overview-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_102) on Sat Feb 04 20:18:05 CST 2017 -->
-<title>Class Hierarchy (wisefy 1.0.6 API)</title>
-<meta name="date" content="2017-02-04">
+<!-- Generated by javadoc (1.8.0_102) on Sat Mar 25 21:42:17 CDT 2017 -->
+<title>Class Hierarchy (wisefy 1.0.7 API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Class Hierarchy (wisefy 1.0.6 API)";
+            parent.document.title="Class Hierarchy (wisefy 1.0.7 API)";
         }
     }
     catch(err) {
diff --git a/wisefy/build.gradle b/wisefy/build.gradle
index d32e6bf0..02840013 100644
--- a/wisefy/build.gradle
+++ b/wisefy/build.gradle
@@ -1,44 +1,9 @@
 apply plugin: 'com.android.library'
-apply plugin: 'jacoco'
 apply plugin: 'com.getkeepsafe.dexcount'
 
 group = rootProject.ext.GROUP
 version = rootProject.ext.VERSION_NAME
 
-def coverageSourceDirs = [
-        '../wisefy/src/main/java'
-]
-
-def classDirs = fileTree(
-        dir: '../wisefy/build/intermediates/classes/debug/com/',
-        excludes: ['**/R.class',
-                   '**/R$*.class',
-                   '**/*$ViewBinder*.*',
-                   '**/*MembersInjector*.*',
-                   '**/BuildConfig.*',
-                   '**/Manifest*.*',
-                   '**/*$Lambda$*.class',
-                   '**/*Factory*.class',
-                   '**/*$Builder*'])
-
-task jacocoDebugTestReport(type: JacocoReport, dependsOn: ["connectedDebugAndroidTest"]) {
-    group = "Reporting"
-    description = "Generate Jacoco coverage report for debug tests"
-    classDirectories = classDirs
-    additionalSourceDirs = files(coverageSourceDirs)
-    sourceDirectories = files(coverageSourceDirs)
-    executionData = files([fileTree(dir: 'build/outputs/code-coverage/connected', include: '**/*.ec')])
-
-    onlyIf = {
-        true
-    }
-
-    reports {
-        xml.enabled = true
-        html.enabled = true
-    }
-}
-
 dexcount {
     format = "tree"
     includeClasses = true
@@ -88,16 +53,17 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.1.1'
+    compile 'com.android.support:appcompat-v7:25.3.0'
 
-    androidTestCompile 'com.android.support:support-annotations:25.1.1'
+    androidTestCompile 'com.android.support:support-annotations:25.3.0'
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
     androidTestCompile 'org.mockito:mockito-android:2.6.9'
 
-    testCompile 'org.mockito:mockito-core:2.6.9'
+    testCompile 'org.mockito:mockito-core:2.7.19'
     testCompile 'junit:junit:4.12'
 }
 
 
 apply from: rootProject.file('gradle/gradle-bintray-install.gradle')
-apply from: rootProject.file('gradle/gradle-bintray-upload.gradle')
\ No newline at end of file
+apply from: rootProject.file('gradle/gradle-bintray-upload.gradle')
+apply from: rootProject.file('gradle/jacoco.gradle')
\ No newline at end of file
diff --git a/wisefy/src/androidTest/java/com/isupatches/wisefy/WiseFyTest.java b/wisefy/src/androidTest/java/com/isupatches/wisefy/WiseFyTest.java
index 6b82843b..4a84ed97 100644
--- a/wisefy/src/androidTest/java/com/isupatches/wisefy/WiseFyTest.java
+++ b/wisefy/src/androidTest/java/com/isupatches/wisefy/WiseFyTest.java
@@ -44,7 +44,7 @@ public void setUp() {
 
         mActivityTestRule.launchActivity(new Intent());
 
-        mWiseFy = new WiseFy.withContext(mActivityTestRule.getActivity()).getSmarts();
+        mWiseFy = new WiseFy.withContext(mActivityTestRule.getActivity()).logging(true).getSmarts();
     }
 
     @Test