diff --git a/.gitignore b/.gitignore
index 249c119..9181ec8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ local.properties
 
 # Android Studio
 .idea
+build/
 */local.properties
 */out
 */build/**
@@ -29,4 +30,4 @@ local.properties
 *.swp
 
 # gradle
-.gradle
\ No newline at end of file
+.gradle
diff --git a/android-pdfview-sample/AndroidManifest.xml b/android-pdfview-sample/AndroidManifest.xml
index 0ca9687..a8fe3f1 100644
--- a/android-pdfview-sample/AndroidManifest.xml
+++ b/android-pdfview-sample/AndroidManifest.xml
@@ -19,20 +19,14 @@
 
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.joanzapata.pdfview.sample"
-	android:versionCode="3"
-	android:versionName="1.0.1" >
-
-	<uses-sdk
-		android:minSdkVersion="8"
-		android:targetSdkVersion="17" />
+	package="com.joanzapata.pdfview.sample" >
 
 	<application
 		android:icon="@drawable/ic_launcher"
         android:theme="@style/AppTheme" 
 		android:label="@string/app_name" >
 		<activity
-			android:name="com.joanzapata.PDFViewActivity_"
+			android:name="com.joanzapata.PDFViewActivity"
 			android:label="@string/app_name" >
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
diff --git a/android-pdfview-sample/assets/sample.pdf b/android-pdfview-sample/assets/sample.pdf
index 376f277..bf37014 100644
Binary files a/android-pdfview-sample/assets/sample.pdf and b/android-pdfview-sample/assets/sample.pdf differ
diff --git a/android-pdfview-sample/build.gradle b/android-pdfview-sample/build.gradle
index 6311312..e3f18ca 100644
--- a/android-pdfview-sample/build.gradle
+++ b/android-pdfview-sample/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'android'
 description = 'android-pdfview-sample'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "19.0.3"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.2"
 
     defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 19
+        minSdkVersion 14
+        targetSdkVersion 23
         versionCode 2
         versionName "1.0.1"
     }
@@ -27,7 +27,7 @@ android {
 
 dependencies {
     compile project(':android-pdfview')
-    provided 'com.googlecode.androidannotations:androidannotations:2.7.1'
-    compile 'com.googlecode.androidannotations:androidannotations-api:2.7.1'
-    compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
+    compile 'com.jakewharton:butterknife:7.0.1'
+    compile 'com.android.support:support-v4:23.1.1'
+    compile 'com.android.support:appcompat-v7:23.1.1'
 }
diff --git a/android-pdfview-sample/res/menu/actionbar.xml b/android-pdfview-sample/res/menu/actionbar.xml
index f2ff5b8..a2bea50 100644
--- a/android-pdfview-sample/res/menu/actionbar.xml
+++ b/android-pdfview-sample/res/menu/actionbar.xml
@@ -19,11 +19,12 @@
     along with Android-pdfview.  If not, see <http://www.gnu.org/licenses/>.
 
 -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/about"
         android:icon="@drawable/ic_about"
         android:title="About"
-        android:showAsAction="ifRoom|withText" />
+        app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/android-pdfview-sample/res/values/styles.xml b/android-pdfview-sample/res/values/styles.xml
index 1053fa5..46ac5d5 100644
--- a/android-pdfview-sample/res/values/styles.xml
+++ b/android-pdfview-sample/res/values/styles.xml
@@ -20,5 +20,5 @@
 -->
 <resources>
 
-    <style name="AppTheme" parent="@style/Theme.Sherlock.Light" />
+    <style name="AppTheme" parent="@style/Theme.AppCompat.Light" />
 </resources>
\ No newline at end of file
diff --git a/android-pdfview-sample/src/main/java/com/joanzapata/PDFViewActivity.java b/android-pdfview-sample/src/main/java/com/joanzapata/PDFViewActivity.java
index cc83e14..cc53aa3 100644
--- a/android-pdfview-sample/src/main/java/com/joanzapata/PDFViewActivity.java
+++ b/android-pdfview-sample/src/main/java/com/joanzapata/PDFViewActivity.java
@@ -18,43 +18,62 @@
  */
 package com.joanzapata;
 
-import android.content.Intent;
-import android.util.Log;
-import com.actionbarsherlock.app.SherlockActivity;
-import com.actionbarsherlock.view.Menu;
-import com.googlecode.androidannotations.annotations.*;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.Toast;
+
 import com.joanzapata.pdfview.PDFView;
+import com.joanzapata.pdfview.listener.OnErrorListener;
 import com.joanzapata.pdfview.listener.OnPageChangeListener;
 import com.joanzapata.pdfview.sample.R;
 
+import butterknife.Bind;
+import butterknife.ButterKnife;
+
 import static java.lang.String.format;
 
-@EActivity(R.layout.activity_main)
-@OptionsMenu(R.menu.actionbar)
-public class PDFViewActivity extends SherlockActivity implements OnPageChangeListener {
+public class PDFViewActivity extends AppCompatActivity implements OnPageChangeListener {
 
     public static final String SAMPLE_FILE = "sample.pdf";
 
     public static final String ABOUT_FILE = "about.pdf";
 
-    @ViewById
-    PDFView pdfView;
+    @Bind(R.id.pdfView) PDFView pdfView;
 
-    @NonConfigurationInstance
     String pdfName = SAMPLE_FILE;
 
-    @NonConfigurationInstance
     Integer pageNumber = 1;
 
-    @AfterViews
-    void afterViews() {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_main);
+        ButterKnife.bind(this);
+
         display(pdfName, false);
     }
 
-    @OptionsItem
-    public void about() {
-        if (!displaying(ABOUT_FILE))
-            display(ABOUT_FILE, true);
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.actionbar, menu);
+
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.about:
+                if (!displaying(ABOUT_FILE)) {
+                    display(ABOUT_FILE, true);
+                }
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
     }
 
     private void display(String assetFileName, boolean jumpToFirstPage) {
@@ -64,6 +83,12 @@ private void display(String assetFileName, boolean jumpToFirstPage) {
         pdfView.fromAsset(assetFileName)
                 .defaultPage(pageNumber)
                 .onPageChange(this)
+                .onError(new OnErrorListener() {
+                    @Override
+                    public void onError(Throwable t) {
+                        Toast.makeText(PDFViewActivity.this, "Ops, got an error: " + t.toString(), Toast.LENGTH_LONG).show();
+                    }
+                })
                 .load();
     }
 
diff --git a/android-pdfview/AndroidManifest.xml b/android-pdfview/AndroidManifest.xml
index 393ac54..867fc1f 100644
--- a/android-pdfview/AndroidManifest.xml
+++ b/android-pdfview/AndroidManifest.xml
@@ -20,12 +20,10 @@
 
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.joanzapata.pdfview"
-      android:versionCode="1"
-      android:versionName="1.0.0">
-    
-	<!-- Min version 8 (2.2) -->
-	<uses-sdk android:minSdkVersion="8"  
-              android:targetSdkVersion="17"/>
-              
+      package="com.joanzapata.pdfview" >
+
+    <application>
+
+    </application>
+
 </manifest>
\ No newline at end of file
diff --git a/android-pdfview/build.gradle b/android-pdfview/build.gradle
index 4088b22..7aae69f 100644
--- a/android-pdfview/build.gradle
+++ b/android-pdfview/build.gradle
@@ -1,10 +1,15 @@
-apply plugin: 'android-library'
-
-description = 'android-pdfview'
+apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.0.3'
+    compileSdkVersion 23
+    buildToolsVersion '23.0.2'
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 23
+        versionCode 1
+        versionName "1.0.0"
+    }
 
     sourceSets {
         main {
@@ -12,4 +17,11 @@ android {
             jniLibs.srcDirs = [ 'libs' ]
         }
     }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
 }
\ No newline at end of file
diff --git a/android-pdfview/src/main/java/com/joanzapata/pdfview/DecodingAsyncTask.java b/android-pdfview/src/main/java/com/joanzapata/pdfview/DecodingAsyncTask.java
index 70b87da..b0bc922 100644
--- a/android-pdfview/src/main/java/com/joanzapata/pdfview/DecodingAsyncTask.java
+++ b/android-pdfview/src/main/java/com/joanzapata/pdfview/DecodingAsyncTask.java
@@ -20,15 +20,12 @@
 
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.util.Log;
-
-import com.joanzapata.pdfview.PDFView;
 
 import org.vudroid.core.DecodeService;
 import org.vudroid.core.DecodeServiceBase;
 import org.vudroid.pdfdroid.codec.PdfContext;
 
-class DecodingAsyncTask extends AsyncTask<Void, Void, Void> {
+class DecodingAsyncTask extends AsyncTask<Void, Void, Throwable> {
 
     /** The decode service used for decoding the PDF */
     private DecodeService decodeService;
@@ -43,17 +40,27 @@ public DecodingAsyncTask(Uri uri, PDFView pdfView) {
         this.cancelled = false;
         this.pdfView = pdfView;
         this.uri = uri;
-    }
 
-    @Override
-    protected Void doInBackground(Void... params) {
         decodeService = new DecodeServiceBase(new PdfContext());
         decodeService.setContentResolver(pdfView.getContext().getContentResolver());
-        decodeService.open(uri);
-        return null;
     }
 
-    protected void onPostExecute(Void result) {
+    @Override
+    protected Throwable doInBackground(Void... params) {
+        try {
+            decodeService.open(uri);
+            return null;
+        } catch (Throwable t) {
+            return t;
+        }
+    }
+
+    protected void onPostExecute(Throwable t) {
+        if (t != null) {
+            pdfView.loadError(t);
+            return;
+        }
+
         if (!cancelled) {
             pdfView.loadComplete(decodeService);
         }
diff --git a/android-pdfview/src/main/java/com/joanzapata/pdfview/PDFView.java b/android-pdfview/src/main/java/com/joanzapata/pdfview/PDFView.java
index 2f1ead0..d2e4299 100644
--- a/android-pdfview/src/main/java/com/joanzapata/pdfview/PDFView.java
+++ b/android-pdfview/src/main/java/com/joanzapata/pdfview/PDFView.java
@@ -24,9 +24,11 @@
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.SurfaceView;
 import com.joanzapata.pdfview.exception.FileNotFoundException;
 import com.joanzapata.pdfview.listener.OnDrawListener;
+import com.joanzapata.pdfview.listener.OnErrorListener;
 import com.joanzapata.pdfview.listener.OnLoadCompleteListener;
 import com.joanzapata.pdfview.listener.OnPageChangeListener;
 import com.joanzapata.pdfview.model.PagePart;
@@ -58,7 +60,7 @@
  *         - DocumentPage = A page of the PDF document.
  *         - UserPage = A page as defined by the user.
  *         By default, they're the same. But the user can change the pages order
- *         using {@link #load(Uri, OnLoadCompleteListener, int[])}. In this
+ *         using {@link #load(Uri, OnLoadCompleteListener, OnErrorListener, int[])}. In this
  *         particular case, a userPage of 5 can refer to a documentPage of 17.
  */
 public class PDFView extends SurfaceView {
@@ -148,6 +150,8 @@ public class PDFView extends SurfaceView {
     /** Call back object to call when the PDF is loaded */
     private OnLoadCompleteListener onLoadCompleteListener;
 
+    private OnErrorListener onErrorListener;
+
     /** Call back object to call when the page has changed */
     private OnPageChangeListener onPageChangeListener;
 
@@ -209,11 +213,11 @@ public PDFView(Context context, AttributeSet set) {
         setWillNotDraw(false);
     }
 
-    private void load(Uri uri, OnLoadCompleteListener listener) {
-        load(uri, listener, null);
+    private void load(Uri uri, OnLoadCompleteListener listener, OnErrorListener onErrorListener) {
+        load(uri, listener, onErrorListener, null);
     }
 
-    private void load(Uri uri, OnLoadCompleteListener onLoadCompleteListener, int[] userPages) {
+    private void load(Uri uri, OnLoadCompleteListener onLoadCompleteListener, OnErrorListener onErrorListener, int[] userPages) {
 
         if (!recycled) {
             throw new IllegalStateException("Don't call load on a PDF View without recycling it first.");
@@ -227,6 +231,7 @@ private void load(Uri uri, OnLoadCompleteListener onLoadCompleteListener, int[]
         }
 
         this.onLoadCompleteListener = onLoadCompleteListener;
+        this.onErrorListener = onErrorListener;
 
         // Start decoding document
         decodingAsyncTask = new DecodingAsyncTask(uri, this);
@@ -315,6 +320,8 @@ public void recycle() {
     @Override
     protected void onDetachedFromWindow() {
         recycle();
+
+        super.onDetachedFromWindow();
     }
 
     @Override
@@ -657,6 +664,14 @@ public void loadComplete(DecodeService decodeService) {
         }
     }
 
+    public void loadError(Throwable t) {
+        if (this.onErrorListener != null) {
+            this.onErrorListener.onError(t);
+        } else {
+            Log.e("PDFView", "load pdf error", t);
+        }
+    }
+
     /**
      * Called when a rendering task is over and
      * a PagePart has been freshly created.
@@ -993,6 +1008,8 @@ public class Configurator {
 
         private OnLoadCompleteListener onLoadCompleteListener;
 
+        private OnErrorListener onErrorListener;
+
         private OnPageChangeListener onPageChangeListener;
 
         private int defaultPage = 1;
@@ -1034,6 +1051,11 @@ public Configurator onLoad(OnLoadCompleteListener onLoadCompleteListener) {
             return this;
         }
 
+        public Configurator onError(OnErrorListener onErrorListener) {
+            this.onErrorListener = onErrorListener;
+            return this;
+        }
+
         public Configurator onPageChange(OnPageChangeListener onPageChangeListener) {
             this.onPageChangeListener = onPageChangeListener;
             return this;
@@ -1074,9 +1096,9 @@ public void load() {
             PDFView.this.maskPaint.setColor(maskColor);
             PDFView.this.maskPaint.setAlpha(maskAlpha);
             if (pageNumbers != null) {
-                PDFView.this.load(uri, onLoadCompleteListener, pageNumbers);
+                PDFView.this.load(uri, onLoadCompleteListener, onErrorListener, pageNumbers);
             } else {
-                PDFView.this.load(uri, onLoadCompleteListener);
+                PDFView.this.load(uri, onLoadCompleteListener, onErrorListener);
             }
         }
 
diff --git a/android-pdfview/src/main/java/com/joanzapata/pdfview/listener/OnErrorListener.java b/android-pdfview/src/main/java/com/joanzapata/pdfview/listener/OnErrorListener.java
new file mode 100644
index 0000000..2b8f3b2
--- /dev/null
+++ b/android-pdfview/src/main/java/com/joanzapata/pdfview/listener/OnErrorListener.java
@@ -0,0 +1,9 @@
+package com.joanzapata.pdfview.listener;
+
+/**
+ * Author:     Sean Hu
+ * Created at: 12/29/15
+ */
+public interface OnErrorListener {
+    void onError(Throwable t) throws Throwable;
+}
diff --git a/build.gradle b/build.gradle
index 4958d8a..bb80032 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.9.+'
+        classpath 'com.android.tools.build:gradle:1.3.0'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7efd7c0..624cb42 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,25 +1,6 @@
-#
-# Copyright 2014 Joan Zapata
-#
-# This file is part of Android-pdfview.
-#
-# Android-pdfview is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Android-pdfview is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Android-pdfview.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-#Fri May 02 16:31:46 BST 2014
+#Wed Nov 18 17:45:17 CST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip