diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..5ac2e8c7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,42 @@
+lt application files
+*.apk
+*.ap_
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
+*.iml
+.idea/
+
+# Keystore files
+*.jks
+
+
diff --git a/app/build.gradle b/app/build.gradle
index b01b2bb4..1ff45f71 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "com.andrognito.pinlockviewapp"
-        minSdkVersion 11
-        targetSdkVersion 23
+        minSdkVersion 17
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
@@ -20,8 +20,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile 'com.android.support:appcompat-v7:25.1.0'
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.4.0'
     compile project(':pinlockview')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 639bfa3e..1ab295f4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.andrognito.pinlockviewapp">
+<manifest package="com.andrognito.pinlockviewapp"
+          xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
@@ -8,14 +8,15 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-
         <activity android:name=".SampleActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <activity android:name=".SampleActivity2">
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/assets/timeburnernormal.ttf b/app/src/main/assets/timeburnernormal.ttf
new file mode 100755
index 00000000..28cee22e
Binary files /dev/null and b/app/src/main/assets/timeburnernormal.ttf differ
diff --git a/app/src/main/java/com/andrognito/pinlockviewapp/SampleActivity.java b/app/src/main/java/com/andrognito/pinlockviewapp/SampleActivity.java
index 188e22d7..64031c48 100644
--- a/app/src/main/java/com/andrognito/pinlockviewapp/SampleActivity.java
+++ b/app/src/main/java/com/andrognito/pinlockviewapp/SampleActivity.java
@@ -1,10 +1,13 @@
 package com.andrognito.pinlockviewapp;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
+import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
+import android.widget.Button;
 
 import com.andrognito.pinlockview.IndicatorDots;
 import com.andrognito.pinlockview.PinLockListener;
@@ -16,6 +19,7 @@ public class SampleActivity extends AppCompatActivity {
 
     private PinLockView mPinLockView;
     private IndicatorDots mIndicatorDots;
+    private Button mBtnExample2;
 
     private PinLockListener mPinLockListener = new PinLockListener() {
         @Override
@@ -41,6 +45,7 @@ protected void onCreate(Bundle savedInstanceState) {
         getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
         setContentView(R.layout.activity_sample);
 
+        mBtnExample2 = (Button) findViewById( R.id.btn_goto_example2 );
         mPinLockView = (PinLockView) findViewById(R.id.pin_lock_view);
         mIndicatorDots = (IndicatorDots) findViewById(R.id.indicator_dots);
 
@@ -49,5 +54,13 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mPinLockView.setPinLength(6);
         mPinLockView.setTextColor(getResources().getColor(R.color.white));
+
+        mBtnExample2.setOnClickListener( new View.OnClickListener(){
+            @Override
+            public void onClick( View v ){
+                Intent i = new Intent( SampleActivity.this, SampleActivity2.class );
+                startActivity( i );
+            }
+        } );
     }
 }
diff --git a/app/src/main/java/com/andrognito/pinlockviewapp/SampleActivity2.java b/app/src/main/java/com/andrognito/pinlockviewapp/SampleActivity2.java
new file mode 100644
index 00000000..a39d2c9c
--- /dev/null
+++ b/app/src/main/java/com/andrognito/pinlockviewapp/SampleActivity2.java
@@ -0,0 +1,61 @@
+package com.andrognito.pinlockviewapp;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.view.Window;
+import android.view.WindowManager;
+
+import com.andrognito.pinlockview.IndicatorDots;
+import com.andrognito.pinlockview.LeftButtonClickListener;
+import com.andrognito.pinlockview.PinLockAdapter;
+import com.andrognito.pinlockview.PinLockListener;
+import com.andrognito.pinlockview.PinLockView;
+
+public class SampleActivity2 extends AppCompatActivity {
+
+    public static final String TAG = "PinLockView";
+
+    private PinLockView mPinLockView;
+    private IndicatorDots mIndicatorDots;
+
+    private PinLockListener mPinLockListener = new PinLockListener() {
+        @Override
+        public void onComplete(String pin) {
+            Log.d(TAG, "Pin complete: " + pin);
+        }
+
+        @Override
+        public void onEmpty() {
+            Log.d(TAG, "Pin empty");
+        }
+
+        @Override
+        public void onPinChange(int pinLength, String intermediatePin) {
+            Log.d(TAG, "Pin changed, new length " + pinLength + " with intermediate pin " + intermediatePin);
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        setContentView(R.layout.activity_sample2);
+
+        mPinLockView = (PinLockView) findViewById(R.id.pin_lock_view);
+        mIndicatorDots = (IndicatorDots) findViewById(R.id.indicator_dots);
+
+        mPinLockView.attachIndicatorDots(mIndicatorDots);
+        mPinLockView.setPinLockListener(mPinLockListener);
+        mPinLockView.setOnClickButtonLeftListener(new LeftButtonClickListener() {
+            @Override
+            public void onLeftButtonClicked(PinLockAdapter.LeftButtonViewHolder numberViewHolder) {
+
+            }
+        });
+
+        mPinLockView.setPinLength(6);
+        mPinLockView.setTextColor(getResources().getColor(R.color.white));
+    }
+}
diff --git a/app/src/main/res/drawable-v21/selector_button_passcode_background.xml b/app/src/main/res/drawable-v21/selector_button_passcode_background.xml
new file mode 100644
index 00000000..89443206
--- /dev/null
+++ b/app/src/main/res/drawable-v21/selector_button_passcode_background.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#50FFFFFF">
+    <item android:id="@android:id/mask" android:drawable="@drawable/selector_mask_oval"/>
+    <item android:drawable="@drawable/shape_button_passcode_background_normal" />
+</ripple>
+
diff --git a/app/src/main/res/drawable-v21/selector_mask_oval.xml b/app/src/main/res/drawable-v21/selector_mask_oval.xml
new file mode 100644
index 00000000..3d8f0ede
--- /dev/null
+++ b/app/src/main/res/drawable-v21/selector_mask_oval.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+  <solid android:color="@android:color/black"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_button_passcode_background.xml b/app/src/main/res/drawable/selector_button_passcode_background.xml
new file mode 100644
index 00000000..4a7c379c
--- /dev/null
+++ b/app/src/main/res/drawable/selector_button_passcode_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/shape_button_passcode_background_pressed" android:state_pressed="true" />
+
+    <item android:drawable="@drawable/shape_button_passcode_background_focused" android:state_focused="true" />
+
+    <item android:drawable="@drawable/shape_button_passcode_background_normal" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_button_passcode_background_focused.xml b/app/src/main/res/drawable/shape_button_passcode_background_focused.xml
new file mode 100644
index 00000000..3e03620b
--- /dev/null
+++ b/app/src/main/res/drawable/shape_button_passcode_background_focused.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <stroke
+        android:width="1dp"
+        android:color="@color/white"/>
+
+    <stroke
+        android:width="1dp"
+        android:color="#ffe100" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_button_passcode_background_normal.xml b/app/src/main/res/drawable/shape_button_passcode_background_normal.xml
new file mode 100644
index 00000000..324efce4
--- /dev/null
+++ b/app/src/main/res/drawable/shape_button_passcode_background_normal.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/white"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_button_passcode_background_pressed.xml b/app/src/main/res/drawable/shape_button_passcode_background_pressed.xml
new file mode 100644
index 00000000..f3013281
--- /dev/null
+++ b/app/src/main/res/drawable/shape_button_passcode_background_pressed.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid android:color="#80FFFFFF" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/white"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_indicator_empty.xml b/app/src/main/res/drawable/shape_indicator_empty.xml
new file mode 100644
index 00000000..c7194dcc
--- /dev/null
+++ b/app/src/main/res/drawable/shape_indicator_empty.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+
+    <stroke
+        android:width="2dp"
+        android:color="@color/white"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_indicator_select.xml b/app/src/main/res/drawable/shape_indicator_select.xml
new file mode 100644
index 00000000..ce2058fb
--- /dev/null
+++ b/app/src/main/res/drawable/shape_indicator_select.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/white"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sample.xml b/app/src/main/res/layout/activity_sample.xml
index f86f1038..8fd5190b 100644
--- a/app/src/main/res/layout/activity_sample.xml
+++ b/app/src/main/res/layout/activity_sample.xml
@@ -1,52 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@color/mine_shaft"
-    tools:context="com.andrognito.pinlockviewapp.SampleActivity">
-
-    <ImageView
-        android:id="@+id/profile_image"
-        android:layout_width="84dp"
-        android:layout_height="84dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="124dp"
-        android:src="@drawable/img_no_avatar" />
-
-    <TextView
-        android:id="@+id/profile_name"
-        android:layout_width="256dp"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/profile_image"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="36dp"
-        android:fontFamily="sans-serif-thin"
-        android:gravity="center"
-        android:maxLines="1"
-        android:text="Welcome"
-        android:textColor="@color/white"
-        android:textSize="34sp" />
-
-    <com.andrognito.pinlockview.IndicatorDots
-        android:id="@+id/indicator_dots"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/profile_name"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="36dp" />
-
-    <com.andrognito.pinlockview.PinLockView
-        android:id="@+id/pin_lock_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/indicator_dots"
-        app:keypadButtonSize="72dp"
-        app:keypadTextSize="18dp"
-        app:keypadShowDeleteButton="false"
-        app:keypadTextColor="@color/white"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="16dp" />
-
-</RelativeLayout>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:background="@color/mine_shaft"
+              tools:context="com.andrognito.pinlockviewapp.SampleActivity">
+
+    <android.support.v4.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <Button
+                android:layout_gravity="right"
+                android:id="@+id/btn_goto_example2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?selectableItemBackgroundBorderless"
+                android:text="Eample2"
+                android:textAllCaps="false"/>
+
+            <ImageView
+                android:id="@+id/profile_image"
+                android:layout_width="84dp"
+                android:layout_height="84dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="72dp"
+                android:src="@drawable/img_no_avatar"/>
+
+            <TextView
+                android:id="@+id/profile_name"
+                android:layout_width="256dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="36dp"
+                android:fontFamily="sans-serif-thin"
+                android:gravity="center"
+                android:maxLines="1"
+                android:text="Welcome"
+                android:textColor="@color/white"
+                android:textSize="34sp"/>
+
+            <com.andrognito.pinlockview.IndicatorDots
+                android:id="@+id/indicator_dots"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="36dp"/>
+
+            <com.andrognito.pinlockview.PinLockView
+                android:id="@+id/pin_lock_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="16dp"
+                app:keypadButtonSize="72dp"
+                app:keypadShowDeleteButton="true"
+                app:keypadTextColor="@color/white"
+                app:keypadTextSize="18dp"/>
+
+        </LinearLayout>
+
+    </android.support.v4.widget.NestedScrollView>
+
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_sample2.xml b/app/src/main/res/layout/activity_sample2.xml
new file mode 100644
index 00000000..ffe77071
--- /dev/null
+++ b/app/src/main/res/layout/activity_sample2.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:background="#8EC63F"
+              tools:context="com.andrognito.pinlockviewapp.SampleActivity">
+
+    <android.support.v4.widget.NestedScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context="com.andrognito.pinlockviewapp.SampleActivity">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            tools:context="com.andrognito.pinlockviewapp.SampleActivity">
+
+
+            <TextView
+                android:id="@+id/profile_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/profile_image"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="96dp"
+                android:fontFamily="sans-serif"
+                android:gravity="center"
+                android:maxLines="1"
+                android:text="Enter your passcode"
+                android:textColor="@color/white"
+                android:textSize="18sp"/>
+
+            <com.andrognito.pinlockview.IndicatorDots
+                android:id="@+id/indicator_dots"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="36dp"
+                app:dotDiameter="12dp"
+                app:dotEmptyBackground="@drawable/shape_indicator_empty"
+                app:dotFilledBackground="@drawable/shape_indicator_select"/>
+
+            <com.andrognito.pinlockview.PinLockView
+                android:id="@+id/pin_lock_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="48dp"
+                android:fontFamily="sans-serif"
+                app:keypadButtonBackground="@drawable/selector_button_passcode_background"
+                app:keypadButtonSize="64dp"
+                app:keypadDeleteButtonPressedColor="#C8C8C8"
+                app:keypadDeleteButtonSize="24dp"
+                app:keypadHorizontalSpacing="24dp"
+                app:keypadLeftButtonText="Test"
+                app:keypadShowDeleteButton="true"
+                app:keypadShowLeftButton="true"
+                app:keypadTextColor="@color/white"
+                app:keypadTextFont="timeburnernormal.ttf"
+                app:keypadTextSize="24dp"
+                app:keypadVerticalSpacing="18dp"
+                app:keypadVibrateButtonClick="true"/>
+
+            <!--app:keypadLeftButtonTextSize=""-->
+        </LinearLayout>
+
+    </android.support.v4.widget.NestedScrollView>
+
+</LinearLayout>
+
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3ab3e9cb..f5a3903d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorPrimary">#757575</color>
+    <color name="colorPrimaryDark">#424242</color>
+    <color name="colorAccent">#FF6E40</color>
 </resources>
diff --git a/build.gradle b/build.gradle
index 530965f1..408c8d30 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,9 +5,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -15,6 +15,7 @@ buildscript {
 
 allprojects {
     repositories {
+        mavenCentral()
         jcenter()
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 122a0dca..2b562dc6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Tue Jan 24 11:08:30 ICT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/pinlockview/build.gradle b/pinlockview/build.gradle
index 45c70814..c3ab650f 100644
--- a/pinlockview/build.gradle
+++ b/pinlockview/build.gradle
@@ -26,12 +26,12 @@ ext {
 
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
-        minSdkVersion 11
-        targetSdkVersion 23
+        minSdkVersion 17
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
@@ -46,9 +46,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:recyclerview-v7:23.4.0'
+    compile 'com.android.support:appcompat-v7:25.1.0'
+    compile 'com.android.support:recyclerview-v7:25.1.0'
 }
 
-apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
-apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
\ No newline at end of file
diff --git a/pinlockview/src/main/java/com/andrognito/pinlockview/CustomizationOptionsBundle.java b/pinlockview/src/main/java/com/andrognito/pinlockview/CustomizationOptionsBundle.java
index 63eee73e..41246f12 100644
--- a/pinlockview/src/main/java/com/andrognito/pinlockview/CustomizationOptionsBundle.java
+++ b/pinlockview/src/main/java/com/andrognito/pinlockview/CustomizationOptionsBundle.java
@@ -5,7 +5,7 @@
 /**
  * The customization options for the buttons in {@link PinLockView}
  * passed to the {@link PinLockAdapter} to decorate the individual views
- *
+ * <p>
  * Created by aritraroy on 01/06/16.
  */
 public class CustomizationOptionsBundle {
@@ -13,12 +13,19 @@ public class CustomizationOptionsBundle {
     private int textColor;
     private int textSize;
     private int buttonSize;
-    private Drawable buttonBackgroundDrawable;
+    private int buttonBackgroundId;
     private Drawable deleteButtonDrawable;
     private int deleteButtonSize;
     private boolean showDeleteButton;
     private int deleteButtonPressesColor;
 
+    private boolean autoHideDeleteButton;
+    private boolean showLeftButton;
+    private String leftButtonText;
+    private int leftButtonTextSize;
+    private String textFontName;
+    private boolean vibrateButtonClick;
+
     public CustomizationOptionsBundle() {
     }
 
@@ -46,12 +53,12 @@ public void setButtonSize(int buttonSize) {
         this.buttonSize = buttonSize;
     }
 
-    public Drawable getButtonBackgroundDrawable() {
-        return buttonBackgroundDrawable;
+    public int getButtonBackgroundId() {
+        return buttonBackgroundId;
     }
 
-    public void setButtonBackgroundDrawable(Drawable buttonBackgroundDrawable) {
-        this.buttonBackgroundDrawable = buttonBackgroundDrawable;
+    public void setButtonBackgroundId(int buttonBackgroundId) {
+        this.buttonBackgroundId = buttonBackgroundId;
     }
 
     public Drawable getDeleteButtonDrawable() {
@@ -85,4 +92,53 @@ public int getDeleteButtonPressesColor() {
     public void setDeleteButtonPressesColor(int deleteButtonPressesColor) {
         this.deleteButtonPressesColor = deleteButtonPressesColor;
     }
+
+    public boolean isAutoHideDeleteButton() {
+        return autoHideDeleteButton;
+    }
+
+    public void setAutoHideDeleteButton(boolean autoHideDeleteButton) {
+        this.autoHideDeleteButton = autoHideDeleteButton;
+    }
+
+    public boolean isShowLeftButton() {
+        return showLeftButton;
+    }
+
+    public void setShowLeftButton(boolean showLeftButton) {
+        this.showLeftButton = showLeftButton;
+    }
+
+    public String getLeftButtonText() {
+        return leftButtonText;
+    }
+
+    public void setLeftButtonText(String leftButtonText) {
+        this.leftButtonText = leftButtonText;
+    }
+
+    public int getLeftButtonTextSize() {
+        return leftButtonTextSize;
+    }
+
+    public void setLeftButtonTextSize(int leftButtonTextSize) {
+        this.leftButtonTextSize = leftButtonTextSize;
+    }
+
+    public String getTextFontName() {
+        return textFontName;
+    }
+
+    public void setTextFontName(String textFontName) {
+        this.textFontName = textFontName;
+    }
+
+
+    public boolean isVibrateButtonClick() {
+        return vibrateButtonClick;
+    }
+
+    public void setVibrateButtonClick(boolean vibrateButtonClick) {
+        this.vibrateButtonClick = vibrateButtonClick;
+    }
 }
diff --git a/pinlockview/src/main/java/com/andrognito/pinlockview/LeftButtonClickListener.java b/pinlockview/src/main/java/com/andrognito/pinlockview/LeftButtonClickListener.java
new file mode 100755
index 00000000..abf9e90d
--- /dev/null
+++ b/pinlockview/src/main/java/com/andrognito/pinlockview/LeftButtonClickListener.java
@@ -0,0 +1,12 @@
+package com.andrognito.pinlockview;
+
+/**
+ * The listener that triggers callbacks for various events
+ * in the {@link PinLockView}
+ * <p>
+ * Created by TheKhaeng on 23/01/17.
+ */
+public interface LeftButtonClickListener{
+
+    void onLeftButtonClicked( PinLockAdapter.LeftButtonViewHolder numberViewHolder );
+}
diff --git a/pinlockview/src/main/java/com/andrognito/pinlockview/PinLockAdapter.java b/pinlockview/src/main/java/com/andrognito/pinlockview/PinLockAdapter.java
index 223f95c0..001b5c68 100644
--- a/pinlockview/src/main/java/com/andrognito/pinlockview/PinLockAdapter.java
+++ b/pinlockview/src/main/java/com/andrognito/pinlockview/PinLockAdapter.java
@@ -3,9 +3,9 @@
 import android.content.Context;
 import android.graphics.PorterDuff;
 import android.graphics.Rect;
-import android.os.Build;
 import android.support.v7.widget.RecyclerView;
 import android.util.TypedValue;
+import android.view.HapticFeedbackConstants;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -21,46 +21,91 @@ public class PinLockAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 
     private static final int VIEW_TYPE_NUMBER = 0;
     private static final int VIEW_TYPE_DELETE = 1;
+    private static final int VIEW_TYPE_LEFT_BUTTON = 2;
 
     private Context mContext;
     private CustomizationOptionsBundle mCustomizationOptionsBundle;
     private OnNumberClickListener mOnNumberClickListener;
     private OnDeleteClickListener mOnDeleteClickListener;
+    private OnLeftButtonClickListener mOnLeftButtonClickListener;
     private int mPinLength;
 
     public PinLockAdapter(Context context) {
         this.mContext = context;
     }
 
+    @Override
+    public int getItemCount() {
+        return 12;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (position == 10 - 1) {
+            return VIEW_TYPE_LEFT_BUTTON;
+        }
+        if (position == getItemCount() - 1) {
+            return VIEW_TYPE_DELETE;
+        }
+        return VIEW_TYPE_NUMBER;
+    }
+
+
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        RecyclerView.ViewHolder viewHolder;
         LayoutInflater inflater = LayoutInflater.from(parent.getContext());
 
-        if (viewType == VIEW_TYPE_NUMBER) {
-            View view = inflater.inflate(R.layout.layout_number_item, parent, false);
-            viewHolder = new NumberViewHolder(view);
-        } else {
+        RecyclerView.ViewHolder viewHolder;
+        if (viewType == VIEW_TYPE_LEFT_BUTTON) {
+            View view = inflater.inflate(R.layout.layout_left_button_item, parent, false);
+            viewHolder = new LeftButtonViewHolder(view);
+        } else if (viewType == VIEW_TYPE_DELETE) {
             View view = inflater.inflate(R.layout.layout_delete_item, parent, false);
             viewHolder = new DeleteViewHolder(view);
+        } else {
+            View view = inflater.inflate(R.layout.layout_number_item, parent, false);
+            viewHolder = new NumberViewHolder(view);
         }
         return viewHolder;
     }
 
     @Override
     public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-        if (holder.getItemViewType() == VIEW_TYPE_NUMBER) {
-            NumberViewHolder vh1 = (NumberViewHolder) holder;
-            configureNumberButtonHolder(vh1, position);
+        if (holder.getItemViewType() == VIEW_TYPE_LEFT_BUTTON) {
+            LeftButtonViewHolder vh1 = (LeftButtonViewHolder) holder;
+            configureLeftButtonHolder(vh1);
+        } else if (holder.getItemViewType() == VIEW_TYPE_NUMBER) {
+            NumberViewHolder vh2 = (NumberViewHolder) holder;
+            configureNumberButtonHolder(vh2, position);
         } else if (holder.getItemViewType() == VIEW_TYPE_DELETE) {
-            DeleteViewHolder vh2 = (DeleteViewHolder) holder;
-            configureDeleteButtonHolder(vh2);
+            DeleteViewHolder vh3 = (DeleteViewHolder) holder;
+            configureDeleteButtonHolder(vh3);
+        }
+    }
+
+    private void configureLeftButtonHolder(LeftButtonViewHolder holder) {
+        if (mCustomizationOptionsBundle.isShowLeftButton()) {
+            holder.mLeftButton.setVisibility(View.VISIBLE);
+        } else {
+            holder.mLeftButton.setVisibility(View.GONE);
+        }
+
+        if (mCustomizationOptionsBundle != null) {
+            holder.mLeftButton.setTextColor(mCustomizationOptionsBundle.getTextColor());
+            holder.mLeftButton.setText(mCustomizationOptionsBundle.getLeftButtonText());
+            holder.mLeftButton.setTypeface(ResourceUtils.findFont(
+                    mContext,
+                    mCustomizationOptionsBundle.getTextFontName(),
+                    null));
+            holder.mLeftButton.setTextSize(TypedValue.COMPLEX_UNIT_PX, mCustomizationOptionsBundle.getLeftButtonTextSize());
         }
     }
 
     private void configureNumberButtonHolder(NumberViewHolder holder, int position) {
         if (holder != null) {
-            if (position == 10) {
+            if( position == 11){
+                holder.mNumberButton.setVisibility(View.INVISIBLE);
+            }else if (position == 10) {
                 holder.mNumberButton.setText("0");
             } else if (position == 9) {
                 holder.mNumberButton.setVisibility(View.INVISIBLE);
@@ -70,14 +115,14 @@ private void configureNumberButtonHolder(NumberViewHolder holder, int position)
 
             if (mCustomizationOptionsBundle != null) {
                 holder.mNumberButton.setTextColor(mCustomizationOptionsBundle.getTextColor());
-                if (mCustomizationOptionsBundle.getButtonBackgroundDrawable() != null) {
-                    if (Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) {
-                        holder.mNumberButton.setBackgroundDrawable(mCustomizationOptionsBundle.getButtonBackgroundDrawable());
-                    } else {
-                        holder.mNumberButton.setBackground(mCustomizationOptionsBundle.getButtonBackgroundDrawable());
-                    }
+                if (mCustomizationOptionsBundle.getButtonBackgroundId() != 0) {
+                    holder.mNumberButton.setBackgroundResource(mCustomizationOptionsBundle.getButtonBackgroundId());
                 }
                 holder.mNumberButton.setTextSize(TypedValue.COMPLEX_UNIT_PX, mCustomizationOptionsBundle.getTextSize());
+                holder.mNumberButton.setTypeface(ResourceUtils.findFont(
+                        mContext,
+                        mCustomizationOptionsBundle.getTextFontName(),
+                        null));
                 LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(mCustomizationOptionsBundle.getButtonSize(), mCustomizationOptionsBundle.getButtonSize());
                 holder.mNumberButton.setLayoutParams(params);
             }
@@ -86,8 +131,9 @@ private void configureNumberButtonHolder(NumberViewHolder holder, int position)
 
     private void configureDeleteButtonHolder(DeleteViewHolder holder) {
         if (holder != null) {
-            if (mCustomizationOptionsBundle.isShowDeleteButton() && mPinLength > 0) {
-                holder.mButtonImage.setVisibility(View.VISIBLE);
+            if (mCustomizationOptionsBundle.isShowDeleteButton()
+                    && (mPinLength > 0 || !mCustomizationOptionsBundle.isAutoHideDeleteButton())) {
+                holder.mDeleteButton.setVisibility(View.VISIBLE);
                 if (mCustomizationOptionsBundle.getDeleteButtonDrawable() != null) {
                     holder.mButtonImage.setImageDrawable(mCustomizationOptionsBundle.getDeleteButtonDrawable());
                 }
@@ -95,23 +141,11 @@ private void configureDeleteButtonHolder(DeleteViewHolder holder) {
                 LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(mCustomizationOptionsBundle.getDeleteButtonSize(), mCustomizationOptionsBundle.getDeleteButtonSize());
                 holder.mButtonImage.setLayoutParams(params);
             } else {
-                holder.mButtonImage.setVisibility(View.GONE);
+                holder.mDeleteButton.setVisibility(View.GONE);
             }
         }
     }
 
-    @Override
-    public int getItemCount() {
-        return 12;
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        if (position == getItemCount() - 1) {
-            return VIEW_TYPE_DELETE;
-        }
-        return VIEW_TYPE_NUMBER;
-    }
 
     public int getPinLength() {
         return mPinLength;
@@ -137,6 +171,14 @@ public void setOnDeleteClickListener(OnDeleteClickListener onDeleteClickListener
         this.mOnDeleteClickListener = onDeleteClickListener;
     }
 
+    public OnLeftButtonClickListener getOnLeftButtonClickListener() {
+        return mOnLeftButtonClickListener;
+    }
+
+    public void setOnLeftButtonClickListener(OnLeftButtonClickListener onLeftButtonClickListener) {
+        this.mOnLeftButtonClickListener = onLeftButtonClickListener;
+    }
+
     public CustomizationOptionsBundle getCustomizationOptions() {
         return mCustomizationOptionsBundle;
     }
@@ -145,6 +187,35 @@ public void setCustomizationOptions(CustomizationOptionsBundle customizationOpti
         this.mCustomizationOptionsBundle = customizationOptionsBundle;
     }
 
+    public class LeftButtonViewHolder extends RecyclerView.ViewHolder {
+        Button mLeftButton;
+
+        public LeftButtonViewHolder(final View itemView) {
+            super(itemView);
+            mLeftButton = (Button) itemView.findViewById(R.id.button);
+            mLeftButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (mOnLeftButtonClickListener != null) {
+                        mOnLeftButtonClickListener.onLeftButtonClicked(LeftButtonViewHolder.this);
+                    }
+                }
+            });
+
+            mLeftButton.setOnTouchListener(new View.OnTouchListener() {
+                @Override
+                public boolean onTouch(View v, MotionEvent event) {
+                    if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                        if( mCustomizationOptionsBundle.isVibrateButtonClick()){
+                            mLeftButton.performHapticFeedback(HapticFeedbackConstants.CONTEXT_CLICK);
+                        }
+                    }
+                    return false;
+                }
+            });
+        }
+    }
+
     public class NumberViewHolder extends RecyclerView.ViewHolder {
         Button mNumberButton;
 
@@ -155,13 +226,26 @@ public NumberViewHolder(final View itemView) {
                 @Override
                 public void onClick(View v) {
                     if (mOnNumberClickListener != null) {
-                        mOnNumberClickListener.onNumberClicked(getAdapterPosition());
+                        mOnNumberClickListener.onNumberClicked(NumberViewHolder.this);
                     }
                 }
             });
+
+            mNumberButton.setOnTouchListener(new View.OnTouchListener() {
+                @Override
+                public boolean onTouch(View v, MotionEvent event) {
+                    if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                        if( mCustomizationOptionsBundle.isVibrateButtonClick()){
+                            mNumberButton.performHapticFeedback(HapticFeedbackConstants.CONTEXT_CLICK);
+                        }
+                    }
+                    return false;
+                }
+            });
         }
     }
 
+
     public class DeleteViewHolder extends RecyclerView.ViewHolder {
         LinearLayout mDeleteButton;
         ImageView mButtonImage;
@@ -195,15 +279,21 @@ public boolean onLongClick(View v) {
 
                 @Override
                 public boolean onTouch(View v, MotionEvent event) {
-                    if(event.getAction() == MotionEvent.ACTION_DOWN){
+                    if (event.getAction() == MotionEvent.ACTION_DOWN) {
                         mButtonImage.setColorFilter(mCustomizationOptionsBundle.getDeleteButtonPressesColor());
+                        if( mCustomizationOptionsBundle.isVibrateButtonClick()){
+                            mDeleteButton.performHapticFeedback(HapticFeedbackConstants.CONTEXT_CLICK);
+                        }
                         rect = new Rect(v.getLeft(), v.getTop(), v.getRight(), v.getBottom());
                     }
-                    if(event.getAction() == MotionEvent.ACTION_UP){
+                    if (event.getAction() == MotionEvent.ACTION_UP) {
                         mButtonImage.clearColorFilter();
                     }
-                    if(event.getAction() == MotionEvent.ACTION_MOVE){
-                        if(!rect.contains(v.getLeft() + (int) event.getX(), v.getTop() + (int) event.getY())){
+                    if (event.getAction() == MotionEvent.ACTION_CANCEL) {
+                        mButtonImage.clearColorFilter();
+                    }
+                    if (event.getAction() == MotionEvent.ACTION_MOVE) {
+                        if (!rect.contains(v.getLeft() + (int) event.getX(), v.getTop() + (int) event.getY())) {
                             mButtonImage.clearColorFilter();
                         }
                     }
@@ -214,7 +304,11 @@ public boolean onTouch(View v, MotionEvent event) {
     }
 
     public interface OnNumberClickListener {
-        void onNumberClicked(int position);
+        void onNumberClicked(NumberViewHolder numberViewHolder);
+    }
+
+    public interface OnLeftButtonClickListener {
+        void onLeftButtonClicked(LeftButtonViewHolder numberViewHolder);
     }
 
     public interface OnDeleteClickListener {
diff --git a/pinlockview/src/main/java/com/andrognito/pinlockview/PinLockView.java b/pinlockview/src/main/java/com/andrognito/pinlockview/PinLockView.java
index f602740a..7f6b82c6 100644
--- a/pinlockview/src/main/java/com/andrognito/pinlockview/PinLockView.java
+++ b/pinlockview/src/main/java/com/andrognito/pinlockview/PinLockView.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -24,99 +25,124 @@ public class PinLockView extends RecyclerView {
     private int mPinLength;
     private int mHorizontalSpacing, mVerticalSpacing;
     private int mTextColor, mDeleteButtonPressedColor;
-    private int mTextSize, mButtonSize, mDeleteButtonSize;
-    private Drawable mButtonBackgroundDrawable;
+    private int mTextSize, mButtonSize, mDeleteButtonSize, mLeftButtonTextSize;
+    private int mButtonBackgroundId;
     private Drawable mDeleteButtonDrawable;
-    private boolean mShowDeleteButton;
+    private boolean mShowDeleteButton, mAutoHideDeleteButton, mShowLeftButton, mVibrateButtonClick;
+    private String mLeftButtonText, mTextFontName;
 
     private IndicatorDots mIndicatorDots;
     private PinLockAdapter mAdapter;
     private PinLockListener mPinLockListener;
+    private LeftButtonClickListener mLeftButtonListener;
     private CustomizationOptionsBundle mCustomizationOptionsBundle;
 
-    private PinLockAdapter.OnNumberClickListener mOnNumberClickListener = new PinLockAdapter.OnNumberClickListener() {
-        @Override
-        public void onNumberClicked(int position) {
-            String key = getData(position);
-            if (mPin.length() < getPinLength()) {
-                mPin = mPin.concat(key);
-
-                if (isIndicatorDotsAttached()) {
-                    mIndicatorDots.updateDot(mPin.length());
-                }
-
-                if (mPin.length() == 1) {
-                    mAdapter.setPinLength(mPin.length());
-                    mAdapter.notifyItemChanged(mAdapter.getItemCount() - 1);
+    @NonNull
+    private PinLockAdapter.OnLeftButtonClickListener createLeftButtonClickListener() {
+        return new PinLockAdapter.OnLeftButtonClickListener() {
+            @Override
+            public void onLeftButtonClicked(PinLockAdapter.LeftButtonViewHolder numberViewHolder) {
+                if (mLeftButtonListener != null) {
+                    mLeftButtonListener.onLeftButtonClicked(numberViewHolder);
                 }
+            }
+        };
+    }
 
-                if (mPinLockListener != null) {
-                    if (mPin.length() == mPinLength) {
-                        mPinLockListener.onComplete(mPin);
-                    } else {
-                        mPinLockListener.onPinChange(mPin.length(), mPin);
-                    }
-                }
-            } else {
-                if (!isShowDeleteButton()) {
-                    resetPinLockView();
+    @NonNull
+    private PinLockAdapter.OnNumberClickListener createNumberClickListener() {
+        return new PinLockAdapter.OnNumberClickListener() {
+            @Override
+            public void onNumberClicked(PinLockAdapter.NumberViewHolder numberViewHolder) {
+                int position = numberViewHolder.getAdapterPosition();
+                String key = getData(position);
+                if (mPin.length() < getPinLength()) {
                     mPin = mPin.concat(key);
 
                     if (isIndicatorDotsAttached()) {
                         mIndicatorDots.updateDot(mPin.length());
                     }
 
-                    if (mPinLockListener != null) {
-                        mPinLockListener.onPinChange(mPin.length(), mPin);
+                    if (mPin.length() == 1) {
+                        mAdapter.setPinLength(mPin.length());
+                        updateDeleteButton();
                     }
 
-                } else {
                     if (mPinLockListener != null) {
-                        mPinLockListener.onComplete(mPin);
+                        if (mPin.length() == mPinLength) {
+                            mPinLockListener.onComplete(mPin);
+                        } else {
+                            mPinLockListener.onPinChange(mPin.length(), mPin);
+                        }
                     }
-                }
-            }
-        }
-    };
+                } else {
+                    if (!isShowDeleteButton()) {
+                        resetPinLockView();
+                        mPin = mPin.concat(key);
 
-    private PinLockAdapter.OnDeleteClickListener mOnDeleteClickListener = new PinLockAdapter.OnDeleteClickListener() {
-        @Override
-        public void onDeleteClicked() {
-            if (mPin.length() > 0) {
-                mPin = mPin.substring(0, mPin.length() - 1);
+                        if (isIndicatorDotsAttached()) {
+                            mIndicatorDots.updateDot(mPin.length());
+                        }
 
-                if (isIndicatorDotsAttached()) {
-                    mIndicatorDots.updateDot(mPin.length());
-                }
+                        if (mPinLockListener != null) {
+                            mPinLockListener.onPinChange(mPin.length(), mPin);
+                        }
 
-                if (mPin.length() == 0) {
-                    mAdapter.setPinLength(mPin.length());
-                    mAdapter.notifyItemChanged(mAdapter.getItemCount() - 1);
+                    } else {
+                        if (mPinLockListener != null) {
+                            mPinLockListener.onComplete(mPin);
+                        }
+                    }
                 }
+            }
+        };
+    }
+
+    @NonNull
+    private PinLockAdapter.OnDeleteClickListener createDeleteClickListener() {
+        return new PinLockAdapter.OnDeleteClickListener() {
+            @Override
+            public void onDeleteClicked() {
+                if (mPin.length() > 0) {
+                    mPin = mPin.substring(0, mPin.length() - 1);
+
+                    if (isIndicatorDotsAttached()) {
+                        mIndicatorDots.updateDot(mPin.length());
+                    }
 
-                if (mPinLockListener != null) {
                     if (mPin.length() == 0) {
+                        mAdapter.setPinLength(mPin.length());
+                        updateDeleteButton();
+                    }
+
+                    if (mPinLockListener != null) {
+                        if (mPin.length() == 0) {
+                            mPinLockListener.onEmpty();
+                            clearInternalPin();
+                        } else {
+                            mPinLockListener.onPinChange(mPin.length(), mPin);
+                        }
+                    }
+                } else {
+                    if (mPinLockListener != null) {
                         mPinLockListener.onEmpty();
-                        clearInternalPin();
-                    } else {
-                        mPinLockListener.onPinChange(mPin.length(), mPin);
                     }
                 }
-            } else {
+            }
+
+            @Override
+            public void onDeleteLongClicked() {
+                resetPinLockView();
                 if (mPinLockListener != null) {
                     mPinLockListener.onEmpty();
                 }
             }
-        }
+        };
+    }
 
-        @Override
-        public void onDeleteLongClicked() {
-            resetPinLockView();
-            if (mPinLockListener != null) {
-                mPinLockListener.onEmpty();
-            }
-        }
-    };
+    private void updateDeleteButton() {
+        mAdapter.notifyItemChanged(mAdapter.getItemCount() - 1);
+    }
 
     public PinLockView(Context context) {
         super(context);
@@ -143,12 +169,18 @@ private void init(AttributeSet attributeSet, int defStyle) {
             mVerticalSpacing = (int) typedArray.getDimension(R.styleable.PinLockView_keypadVerticalSpacing, ResourceUtils.getDimensionInPx(getContext(), R.dimen.default_vertical_spacing));
             mTextColor = typedArray.getColor(R.styleable.PinLockView_keypadTextColor, ResourceUtils.getColor(getContext(), R.color.white));
             mTextSize = (int) typedArray.getDimension(R.styleable.PinLockView_keypadTextSize, ResourceUtils.getDimensionInPx(getContext(), R.dimen.default_text_size));
+            mTextFontName = typedArray.getString(R.styleable.PinLockView_keypadTextFont);
+            mVibrateButtonClick = typedArray.getBoolean(R.styleable.PinLockView_keypadVibrateButtonClick, true);
             mButtonSize = (int) typedArray.getDimension(R.styleable.PinLockView_keypadButtonSize, ResourceUtils.getDimensionInPx(getContext(), R.dimen.default_button_size));
+            mButtonBackgroundId = typedArray.getResourceId(R.styleable.PinLockView_keypadButtonBackground, 0);
             mDeleteButtonSize = (int) typedArray.getDimension(R.styleable.PinLockView_keypadDeleteButtonSize, ResourceUtils.getDimensionInPx(getContext(), R.dimen.default_delete_button_size));
-            mButtonBackgroundDrawable = typedArray.getDrawable(R.styleable.PinLockView_keypadButtonBackgroundDrawable);
             mDeleteButtonDrawable = typedArray.getDrawable(R.styleable.PinLockView_keypadDeleteButtonDrawable);
-            mShowDeleteButton = typedArray.getBoolean(R.styleable.PinLockView_keypadShowDeleteButton, true);
             mDeleteButtonPressedColor = typedArray.getColor(R.styleable.PinLockView_keypadDeleteButtonPressedColor, ResourceUtils.getColor(getContext(), R.color.greyish));
+            mShowDeleteButton = typedArray.getBoolean(R.styleable.PinLockView_keypadShowDeleteButton, true);
+            mShowLeftButton = typedArray.getBoolean(R.styleable.PinLockView_keypadShowLeftButton, false);
+            mLeftButtonText = typedArray.getString(R.styleable.PinLockView_keypadLeftButtonText);
+            mLeftButtonTextSize = (int) typedArray.getDimension(R.styleable.PinLockView_keypadLeftButtonTextSize, ResourceUtils.getDimensionInPx(getContext(), R.dimen.default_text_size));
+            mAutoHideDeleteButton = typedArray.getBoolean(R.styleable.PinLockView_keypadAutoHideDeleteButton, true);
         } finally {
             typedArray.recycle();
         }
@@ -156,13 +188,18 @@ private void init(AttributeSet attributeSet, int defStyle) {
         mCustomizationOptionsBundle = new CustomizationOptionsBundle();
         mCustomizationOptionsBundle.setTextColor(mTextColor);
         mCustomizationOptionsBundle.setTextSize(mTextSize);
+        mCustomizationOptionsBundle.setTextFontName(mTextFontName);
+        mCustomizationOptionsBundle.setVibrateButtonClick(mVibrateButtonClick);
         mCustomizationOptionsBundle.setButtonSize(mButtonSize);
-        mCustomizationOptionsBundle.setButtonBackgroundDrawable(mButtonBackgroundDrawable);
+        mCustomizationOptionsBundle.setButtonBackgroundId(mButtonBackgroundId);
         mCustomizationOptionsBundle.setDeleteButtonDrawable(mDeleteButtonDrawable);
         mCustomizationOptionsBundle.setDeleteButtonSize(mDeleteButtonSize);
+        mCustomizationOptionsBundle.setShowLeftButton(mShowLeftButton);
+        mCustomizationOptionsBundle.setLeftButtonText(mLeftButtonText);
+        mCustomizationOptionsBundle.setLeftButtonTextSize(mLeftButtonTextSize);
         mCustomizationOptionsBundle.setShowDeleteButton(mShowDeleteButton);
+        mCustomizationOptionsBundle.setAutoHideDeleteButton(mAutoHideDeleteButton);
         mCustomizationOptionsBundle.setDeleteButtonPressesColor(mDeleteButtonPressedColor);
-
         initView();
     }
 
@@ -170,8 +207,9 @@ private void initView() {
         setLayoutManager(new GridLayoutManager(getContext(), 3));
 
         mAdapter = new PinLockAdapter(getContext());
-        mAdapter.setOnItemClickListener(mOnNumberClickListener);
-        mAdapter.setOnDeleteClickListener(mOnDeleteClickListener);
+        mAdapter.setOnItemClickListener(createNumberClickListener());
+        mAdapter.setOnDeleteClickListener(createDeleteClickListener());
+        mAdapter.setOnLeftButtonClickListener(createLeftButtonClickListener());
         mAdapter.setCustomizationOptions(mCustomizationOptionsBundle);
         setAdapter(mAdapter);
 
@@ -179,6 +217,7 @@ private void initView() {
         setOverScrollMode(OVER_SCROLL_NEVER);
     }
 
+
     /**
      * Sets a {@link PinLockListener} to the to listen to pin update events
      *
@@ -188,6 +227,15 @@ public void setPinLockListener(PinLockListener pinLockListener) {
         this.mPinLockListener = pinLockListener;
     }
 
+    /**
+     * Sets a {@link LeftButtonClickListener} to the to listen to left button update events
+     *
+     * @param leftButtonListener the listener
+     */
+    public void setOnClickButtonLeftListener(LeftButtonClickListener leftButtonListener) {
+        this.mLeftButtonListener = leftButtonListener;
+    }
+
     /**
      * Get the length of the current pin length
      *
@@ -250,6 +298,45 @@ public void setTextSize(int textSize) {
         mAdapter.notifyDataSetChanged();
     }
 
+    /**
+     * Gets text font name.
+     *
+     * @return the text font name
+     */
+    public String getTextFontName() {
+        return mTextFontName;
+    }
+
+    /**
+     * Sets text font.
+     *
+     * @param fontPathName the font path name
+     */
+    public void setTextFont(String fontPathName) {
+        this.mTextFontName = fontPathName;
+        mCustomizationOptionsBundle.setTextFontName(fontPathName);
+        mAdapter.notifyDataSetChanged();
+    }
+
+    /**
+     * Is vibrate button click boolean.
+     *
+     * @return the boolean
+     */
+    public boolean isVibrateButtonClick() {
+        return mVibrateButtonClick;
+    }
+
+    /**
+     * Sets vibrate button click.
+     *
+     * @param isVibrate the is vibrate
+     */
+    public void setVibrateButtonClick(boolean isVibrate) {
+        this.mVibrateButtonClick = isVibrate;
+        mCustomizationOptionsBundle.setVibrateButtonClick(isVibrate);
+    }
+
     /**
      * Get the size of the pin buttons
      *
@@ -273,20 +360,20 @@ public void setButtonSize(int buttonSize) {
     /**
      * Get the current background drawable of the buttons, can be null
      *
-     * @return the background drawable
+     * @return the background id
      */
-    public Drawable getButtonBackgroundDrawable() {
-        return mButtonBackgroundDrawable;
+    public int getButtonBackgroundDrawable() {
+        return mButtonBackgroundId;
     }
 
     /**
-     * Set the background drawable of the buttons dynamically
+     * Set the background id of the buttons dynamically
      *
-     * @param buttonBackgroundDrawable the background drawable
+     * @param id the background id
      */
-    public void setButtonBackgroundDrawable(Drawable buttonBackgroundDrawable) {
-        this.mButtonBackgroundDrawable = buttonBackgroundDrawable;
-        mCustomizationOptionsBundle.setButtonBackgroundDrawable(buttonBackgroundDrawable);
+    public void setButtonBackgroundId(int id) {
+        this.mButtonBackgroundId = id;
+        mCustomizationOptionsBundle.setButtonBackgroundId(id);
         mAdapter.notifyDataSetChanged();
     }
 
@@ -370,6 +457,86 @@ public void setDeleteButtonPressedColor(int deleteButtonPressedColor) {
         mAdapter.notifyDataSetChanged();
     }
 
+    /**
+     * Is show left button boolean.
+     *
+     * @return the boolean
+     */
+    public boolean isShowLeftButton() {
+        return mShowLeftButton;
+    }
+
+    /**
+     * Sets show left button.
+     *
+     * @param isShow  is show left button
+     */
+    public void setShowLeftButton(boolean isShow) {
+        this.mShowLeftButton = isShow;
+        mCustomizationOptionsBundle.setShowLeftButton(isShow);
+        mAdapter.notifyDataSetChanged();
+    }
+
+    /**
+     * Gets left button text.
+     *
+     * @return the left button text
+     */
+    public String getLeftButtonText() {
+        return mLeftButtonText;
+    }
+
+    /**
+     * Sets left button text.
+     *
+     * @param text the text show in left button
+     */
+    public void setLeftButtonText(String text) {
+        this.mLeftButtonText = text;
+        mCustomizationOptionsBundle.setLeftButtonText(text);
+        mAdapter.notifyDataSetChanged();
+    }
+
+    /**
+     * Gets left button text size.
+     *
+     * @return the left button text size
+     */
+    public int getLeftButtonTextSize() {
+        return mLeftButtonTextSize;
+    }
+
+    /**
+     * Sets left button text size.
+     *
+     * @param textSize the text size in left button
+     */
+    public void setLeftButtonTextSize(int textSize) {
+        this.mLeftButtonTextSize = textSize;
+        mCustomizationOptionsBundle.setLeftButtonTextSize(textSize);
+        mAdapter.notifyDataSetChanged();
+    }
+
+    /**
+     * Is auto hide delete button boolean.
+     *
+     * @return the boolean auto hide delete button
+     */
+    public boolean isAutoHideDeleteButton() {
+        return mAutoHideDeleteButton;
+    }
+
+    /**
+     * Sets auto hide delete button.
+     *
+     * @param isAutoHide the is auto hide delete button
+     */
+    public void setAutoHideDeleteButton(boolean isAutoHide) {
+        this.mAutoHideDeleteButton = isAutoHide;
+        mCustomizationOptionsBundle.setAutoHideDeleteButton(isAutoHide);
+        mAdapter.notifyDataSetChanged();
+    }
+
     private void clearInternalPin() {
         mPin = "";
     }
@@ -383,7 +550,7 @@ public void resetPinLockView() {
         clearInternalPin();
 
         mAdapter.setPinLength(mPin.length());
-        mAdapter.notifyItemChanged(mAdapter.getItemCount() - 1);
+        updateDeleteButton();
 
         if (mIndicatorDots != null) {
             mIndicatorDots.updateDot(mPin.length());
@@ -413,4 +580,5 @@ public String getData(int position) {
             return "0";
         return String.valueOf((position + 1) % 10);
     }
+
 }
diff --git a/pinlockview/src/main/java/com/andrognito/pinlockview/ResourceUtils.java b/pinlockview/src/main/java/com/andrognito/pinlockview/ResourceUtils.java
index 57d7016b..267455bc 100644
--- a/pinlockview/src/main/java/com/andrognito/pinlockview/ResourceUtils.java
+++ b/pinlockview/src/main/java/com/andrognito/pinlockview/ResourceUtils.java
@@ -1,16 +1,28 @@
 package com.andrognito.pinlockview;
 
 import android.content.Context;
+import android.content.res.AssetManager;
+import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.ColorRes;
 import android.support.annotation.DimenRes;
 import android.support.annotation.DrawableRes;
 import android.support.v4.content.ContextCompat;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Created by aritraroy on 10/06/16.
  */
 public class ResourceUtils {
+    private final static String TAG = ResourceUtils.class.getSimpleName();
+
+    private static Map<String, Typeface> cachedFontMap = new HashMap<String, Typeface>();
 
     private ResourceUtils() {
         throw new AssertionError();
@@ -27,4 +39,50 @@ public static float getDimensionInPx(Context context, @DimenRes int id) {
     public static Drawable getDrawable(Context context, @DrawableRes int id) {
         return ContextCompat.getDrawable(context, id);
     }
+
+    public static Typeface findFont(Context context, String fontPath, String defaultFontPath) {
+
+        if (fontPath == null) {
+            return Typeface.DEFAULT;
+        }
+
+        String fontName = new File(fontPath).getName();
+        String defaultFontName = "";
+        if (!TextUtils.isEmpty(defaultFontPath)) {
+            defaultFontName = new File(defaultFontPath).getName();
+        }
+
+        if (cachedFontMap.containsKey(fontName)) {
+            return cachedFontMap.get(fontName);
+        } else {
+            try {
+                AssetManager assets = context.getResources().getAssets();
+
+                if (Arrays.asList(assets.list("")).contains(fontPath)) {
+                    Typeface typeface = Typeface.createFromAsset(context.getAssets(), fontName);
+                    cachedFontMap.put(fontName, typeface);
+                    return typeface;
+                } else if (Arrays.asList(assets.list("fonts")).contains(fontName)) {
+                    Typeface typeface = Typeface.createFromAsset(context.getAssets(), String.format("fonts/%s", fontName));
+                    cachedFontMap.put(fontName, typeface);
+                    return typeface;
+                } else if (Arrays.asList(assets.list("iconfonts")).contains(fontName)) {
+                    Typeface typeface = Typeface.createFromAsset(context.getAssets(), String.format("iconfonts/%s", fontName));
+                    cachedFontMap.put(fontName, typeface);
+                    return typeface;
+                } else if (!TextUtils.isEmpty(defaultFontPath) && Arrays.asList(assets.list("")).contains(defaultFontPath)) {
+                    Typeface typeface = Typeface.createFromAsset(context.getAssets(), defaultFontPath);
+                    cachedFontMap.put(defaultFontName, typeface);
+                    return typeface;
+                } else {
+                    throw new Exception("Font not Found");
+                }
+
+            } catch (Exception e) {
+                Log.e(TAG, String.format("Unable to find %s font. Using Typeface.DEFAULT instead.", fontName));
+                cachedFontMap.put(fontName, Typeface.DEFAULT);
+                return Typeface.DEFAULT;
+            }
+        }
+    }
 }
diff --git a/pinlockview/src/main/res/layout/layout_left_button_item.xml b/pinlockview/src/main/res/layout/layout_left_button_item.xml
new file mode 100755
index 00000000..e0934790
--- /dev/null
+++ b/pinlockview/src/main/res/layout/layout_left_button_item.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        android:textAllCaps="false"
+        android:background="?selectableItemBackgroundBorderless" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/pinlockview/src/main/res/values/attrs.xml b/pinlockview/src/main/res/values/attrs.xml
index 32eda3d7..4e381743 100644
--- a/pinlockview/src/main/res/values/attrs.xml
+++ b/pinlockview/src/main/res/values/attrs.xml
@@ -4,13 +4,19 @@
         <attr name="pinLength" format="integer" />
         <attr name="keypadTextColor" format="color" />
         <attr name="keypadTextSize" format="dimension" />
+        <attr name="keypadTextFont" format="string" />
+        <attr name="keypadVibrateButtonClick" format="boolean" />
         <attr name="keypadButtonSize" format="dimension" />
         <attr name="keypadVerticalSpacing" format="dimension" />
         <attr name="keypadHorizontalSpacing" format="dimension" />
-        <attr name="keypadButtonBackgroundDrawable" format="integer" />
+        <attr name="keypadButtonBackground" format="reference" />
         <attr name="keypadDeleteButtonDrawable" format="integer" />
         <attr name="keypadDeleteButtonSize" format="dimension" />
+        <attr name="keypadShowLeftButton" format="boolean" />
+        <attr name="keypadLeftButtonText" format="string" />
+        <attr name="keypadLeftButtonTextSize" format="dimension" />
         <attr name="keypadShowDeleteButton" format="boolean" />
+        <attr name="keypadAutoHideDeleteButton" format="boolean" />
         <attr name="keypadDeleteButtonPressedColor" format="color" />
 
         <attr name="dotEmptyBackground" format="reference" />