diff --git a/app/src/main/java/io/github/armcha/RecyclerViewActivity.kt b/app/src/main/java/io/github/armcha/RecyclerViewActivity.kt
index b248cdd..578e503 100644
--- a/app/src/main/java/io/github/armcha/RecyclerViewActivity.kt
+++ b/app/src/main/java/io/github/armcha/RecyclerViewActivity.kt
@@ -36,11 +36,16 @@ class RecyclerViewActivity : AppCompatActivity() {
                 val autoLinkTextView = holder.itemView.autoLinkTextView
                 val context = holder.itemView.context
                 val custom = MODE_CUSTOM("\\sAndroid\\b")
+                val custom1 = MODE_CUSTOM("\\sapp\\b")
+                val custom2 = MODE_CUSTOM("\\sbased\\b")
                 autoLinkTextView.addAutoLinkMode(
                         MODE_HASHTAG,
                         MODE_URL,
                         MODE_PHONE,
                         MODE_EMAIL,
+
+                        custom1,
+                        custom2,
                         custom,
                         MODE_MENTION)
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 442dd1a..b87c421 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">AutoLinkTextView</string>
-    <string name="android_text">Android is a mobile operating system developed by https://google.com.
+    <string name="android_text">https://www.android.com/gms Android is a mobile operating system developed by https://google.com.
             It is based on a modified version of the @Linux kernel and other open source software,
             and is designed @primarily for touchscreen mobile devices such as smartphones and #tablets.
             In addition, https://github.com/armcha/AutoLinkTextViewV2 has developed Android TV for televisions, Android Auto for cars
@@ -16,7 +16,7 @@
             which use 801-691-7894 their own equivalents to Google Mobile Services.
     </string>
 
-    <string name="android_text_short">Android is a mobile operating system developed by https://google.com.
+    <string name="android_text_short">https://www.android.com/gms Android is a mobile operating system developed by https://google.com.
             It is based on a modified version of the @Linux kernel and other open source software,
             and is designed @primarily for touchscreen mobile devices such as smartphones and #tablets.
             \n\n In addition, https://google.com has developed Android TV for televisions, Android Auto for cars
diff --git a/autolinklibrary/src/main/java/io/github/armcha/autolink/Mode.kt b/autolinklibrary/src/main/java/io/github/armcha/autolink/Mode.kt
index 33dd4d9..365cadc 100644
--- a/autolinklibrary/src/main/java/io/github/armcha/autolink/Mode.kt
+++ b/autolinklibrary/src/main/java/io/github/armcha/autolink/Mode.kt
@@ -42,7 +42,26 @@ object MODE_MENTION : Mode("Mention")
 object MODE_URL : Mode("Url")
 object MODE_PHONE : Mode("Phone")
 object MODE_EMAIL : Mode("Email")
-class MODE_CUSTOM(val regex: String) : Mode("Custom")
+class MODE_CUSTOM(val regex: String) : Mode("Custom"){
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        if (!super.equals(other)) return false
+
+        other as MODE_CUSTOM
+
+        if (regex != other.regex) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = super.hashCode()
+        result = 31 * result + regex.hashCode()
+        return result
+    }
+
+}
 
 
 
diff --git a/build.gradle b/build.gradle
index c2305db..f0d160b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0-alpha12'
+        classpath 'com.android.tools.build:gradle:3.4.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "guru.stefma.bintrayrelease:bintrayrelease:1.1.1"
     }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 13372ae..f6b961f 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 647ed22..7a22478 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Sep 16 11:20:20 AMT 2019
+#Wed Jul 03 13:17:29 PKT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip