diff --git a/build.gradle b/build.gradle
index 9b8abe4..ac3da70 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,10 +2,11 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.2'
+        classpath 'com.android.tools.build:gradle:3.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -14,6 +15,9 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
+        mavenLocal()
+        mavenCentral()
         jcenter()
     }
 }
diff --git a/demo-app/build.gradle b/demo-app/build.gradle
index c5cdaa4..d7d96fb 100644
--- a/demo-app/build.gradle
+++ b/demo-app/build.gradle
@@ -1,27 +1,32 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 20
-    buildToolsVersion '20.0.0'
+    compileSdkVersion 27
+    buildToolsVersion "27.0.2"
     defaultConfig {
         applicationId 'com.psaravan.filebrowserview.demo'
-        minSdkVersion 14
-        targetSdkVersion 20
+        minSdkVersion 19
+        targetSdkVersion 21
         versionCode 1
         versionName '1.0'
     }
-    buildTypes {
-        release {
-            runProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    productFlavors {
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
+//    buildTypes {
+//        release {
+//            runProguard false
+//            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+//        }
+//    }
+//    productFlavors {
+//    }
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:20.0.0'
-    compile project(':library')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:appcompat-v7:27.0.0'
+    implementation project(':library')
 }
diff --git a/demo-app/src/main/AndroidManifest.xml b/demo-app/src/main/AndroidManifest.xml
index f2f92ae..ccbe230 100644
--- a/demo-app/src/main/AndroidManifest.xml
+++ b/demo-app/src/main/AndroidManifest.xml
@@ -2,6 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.psaravan.filebrowserview.demo" >
 
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
diff --git a/demo-app/src/main/java/com/psaravan/filebrowserview/demo/DialogFragment/DialogFragment.java b/demo-app/src/main/java/com/psaravan/filebrowserview/demo/DialogFragment/DialogFragment.java
index f82c91a..b9f50be 100644
--- a/demo-app/src/main/java/com/psaravan/filebrowserview/demo/DialogFragment/DialogFragment.java
+++ b/demo-app/src/main/java/com/psaravan/filebrowserview/demo/DialogFragment/DialogFragment.java
@@ -17,6 +17,7 @@
 
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Environment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -47,7 +48,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
         //Customize the view.
         mFileBrowserView.setFileBrowserLayoutType(FileBrowserView.FILE_BROWSER_LIST_LAYOUT) //Set the type of view to use.
-                        .setDefaultDirectory(new File("/")) //Set the default directory to show.
+                        .setDefaultDirectory(Environment.getExternalStorageDirectory()) //Set the default directory to show.
                         .setShowHiddenFiles(true) //Set whether or not you want to show hidden files.
                         .showItemSizes(true) //Shows the sizes of each item in the list.
                         .showOverflowMenus(true) //Shows the overflow menus for each item in the list.
diff --git a/demo-app/src/main/java/com/psaravan/filebrowserview/demo/GridActivity/GridActivity.java b/demo-app/src/main/java/com/psaravan/filebrowserview/demo/GridActivity/GridActivity.java
index df70564..febcbe9 100644
--- a/demo-app/src/main/java/com/psaravan/filebrowserview/demo/GridActivity/GridActivity.java
+++ b/demo-app/src/main/java/com/psaravan/filebrowserview/demo/GridActivity/GridActivity.java
@@ -18,6 +18,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Environment;
 
 import com.psaravan.filebrowserview.demo.R;
 import com.psaravan.filebrowserview.lib.Interfaces.NavigationInterface;
@@ -49,7 +50,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         //Customize the view.
         mFileBrowserView.setFileBrowserLayoutType(FileBrowserView.FILE_BROWSER_GRID_LAYOUT) //Set the type of view to use.
-                        .setDefaultDirectory(new File("/")) //Set the default directory to show.
+                        .setDefaultDirectory(Environment.getExternalStorageDirectory()) //Set the default directory to show.
                         .setShowHiddenFiles(true) //Set whether or not you want to show hidden files.
                         .showItemSizes(true) //Shows the sizes of each item in the list.
                         .showOverflowMenus(true) //Shows the overflow menus for each item in the list.
@@ -70,7 +71,7 @@ protected void onCreate(Bundle savedInstanceState) {
         @Override
         public void onNewDirLoaded(File dirFile) {
             //Update the action bar title.
-            getActionBar().setTitle(dirFile.getAbsolutePath());
+            setTitle(dirFile.getAbsolutePath());
         }
 
         @Override
@@ -92,17 +93,20 @@ public void onFileFolderOpenFailed(File file) {
 
     @Override
     public void onBackPressed() {
-        if (mFileBrowserView!=null) {
+        if (mFileBrowserView != null) {
             File parentDir = mFileBrowserView.getParentDir();
 
-            if (parentDir!=null) {
-                mFileBrowserView.getFileBrowserEngine().loadDir(parentDir);
+            if (parentDir != null) {
+                try {
+                    mFileBrowserView.getFileBrowserEngine().loadDir(parentDir);
+                    mFileBrowserView.setDefaultDirectory(parentDir);
+                    mFileBrowserView.init();
+                } catch (Exception ex) {
+                    super.onBackPressed();
+                }
             } else {
                 super.onBackPressed();
             }
-
         }
-
     }
-
 }
diff --git a/demo-app/src/main/java/com/psaravan/filebrowserview/demo/ListActivity/ListActivity.java b/demo-app/src/main/java/com/psaravan/filebrowserview/demo/ListActivity/ListActivity.java
index 03c50ef..26af193 100644
--- a/demo-app/src/main/java/com/psaravan/filebrowserview/demo/ListActivity/ListActivity.java
+++ b/demo-app/src/main/java/com/psaravan/filebrowserview/demo/ListActivity/ListActivity.java
@@ -18,6 +18,8 @@
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Environment;
+import android.util.Log;
 
 import com.psaravan.filebrowserview.demo.R;
 import com.psaravan.filebrowserview.lib.Interfaces.NavigationInterface;
@@ -49,7 +51,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         //Customize the view.
         mFileBrowserView.setFileBrowserLayoutType(FileBrowserView.FILE_BROWSER_LIST_LAYOUT) //Set the type of view to use.
-                        .setDefaultDirectory(new File("/")) //Set the default directory to show.
+                        .setDefaultDirectory(Environment.getExternalStorageDirectory()) //Set the default directory to show.
                         .setShowHiddenFiles(true) //Set whether or not you want to show hidden files.
                         .showItemSizes(true) //Shows the sizes of each item in the list.
                         .showOverflowMenus(true) //Shows the overflow menus for each item in the list.
@@ -70,22 +72,22 @@ protected void onCreate(Bundle savedInstanceState) {
         @Override
         public void onNewDirLoaded(File dirFile) {
             //Update the action bar title.
-            getActionBar().setTitle(dirFile.getAbsolutePath());
+            setTitle(dirFile.getAbsolutePath());
         }
 
         @Override
         public void onFileOpened(File file) {
-
+            Log.d("ListActivity", "onFileOpened");
         }
 
         @Override
         public void onParentDirLoaded(File dirFile) {
-
+            Log.d("ListActivity", "onParentDirLoaded");
         }
 
         @Override
         public void onFileFolderOpenFailed(File file) {
-
+            Log.d("ListActivity", "onFileFolderOpenFailed");
         }
 
     };
@@ -96,7 +98,15 @@ public void onBackPressed() {
             File parentDir = mFileBrowserView.getParentDir();
 
             if (parentDir!=null) {
-                mFileBrowserView.getFileBrowserEngine().loadDir(parentDir);
+                try {
+                    mFileBrowserView.getFileBrowserEngine().loadDir(parentDir);
+                    mFileBrowserView.setDefaultDirectory(parentDir);
+                    mFileBrowserView.init();
+                }
+                catch(Exception ex)
+                {
+                    super.onBackPressed();
+                }
             } else {
                 super.onBackPressed();
             }
diff --git a/demo-app/src/main/java/com/psaravan/filebrowserview/demo/MainActivity/MainActivity.java b/demo-app/src/main/java/com/psaravan/filebrowserview/demo/MainActivity/MainActivity.java
index ce7fcdd..ccf42fa 100644
--- a/demo-app/src/main/java/com/psaravan/filebrowserview/demo/MainActivity/MainActivity.java
+++ b/demo-app/src/main/java/com/psaravan/filebrowserview/demo/MainActivity/MainActivity.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
@@ -36,7 +36,7 @@
  *
  * @author Saravan Pantham
  */
-public class MainActivity extends ActionBarActivity {
+public class MainActivity extends AppCompatActivity {
 
     //Context.
     private Context mContext;
diff --git a/demo-app/src/main/java/com/psaravan/filebrowserview/demo/TabbedBrowsingActivity/TabbedListActivity.java b/demo-app/src/main/java/com/psaravan/filebrowserview/demo/TabbedBrowsingActivity/TabbedListActivity.java
index 02a899c..46fa3f0 100644
--- a/demo-app/src/main/java/com/psaravan/filebrowserview/demo/TabbedBrowsingActivity/TabbedListActivity.java
+++ b/demo-app/src/main/java/com/psaravan/filebrowserview/demo/TabbedBrowsingActivity/TabbedListActivity.java
@@ -72,7 +72,7 @@ protected void onCreate(Bundle savedInstanceState) {
         @Override
         public void onNewDirLoaded(File dirFile) {
             //Update the action bar title.
-            getActionBar().setTitle(dirFile.getAbsolutePath());
+            setTitle(dirFile.getAbsolutePath());
         }
 
         @Override
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1e61d1f..98b20d3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/library/build.gradle b/library/build.gradle
index 960734c..2f8fc47 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,27 +1,32 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 20
-    buildToolsVersion '20.0.0'
+    compileSdkVersion 27
+    buildToolsVersion "27.0.2"
     defaultConfig {
-        applicationId 'com.psaravan.filebrowserview.lib'
-        minSdkVersion 14
-        targetSdkVersion 20
+        minSdkVersion 19
+        targetSdkVersion 21
         versionCode 1
         versionName '1.0'
     }
-    buildTypes {
-        release {
-            runProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    productFlavors {
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
+
+//    buildTypes {
+//        release {
+////            runProguard false
+////            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+//        }
+//    }
+//    productFlavors {
+//    }
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:20.0.0'
-    compile files('libs/commons-io-2.4.jar')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:appcompat-v7:27.0.0'
+    implementation files('libs/commons-io-2.4.jar')
 }
diff --git a/library/library.iml b/library/library.iml
index 87ab9e5..a0c9379 100644
--- a/library/library.iml
+++ b/library/library.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="FileBrowserView" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":library" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -10,82 +10,115 @@
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <afterSyncTasks>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="LIBRARY_PROJECT" value="true" />
+        <option name="PROJECT_TYPE" value="1" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 20 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-20.0.0" level="project" />
-    <orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-20.0.0" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-20.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:C.\Progetti\Applicazioni\FileBrowserView\library\libs\commons-io-2.4.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-compat-27.0.0" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/library/src/main/java/com/psaravan/filebrowserview/lib/FileBrowserEngine/FileBrowserEngine.java b/library/src/main/java/com/psaravan/filebrowserview/lib/FileBrowserEngine/FileBrowserEngine.java
index 991fe1c..9f28b4a 100644
--- a/library/src/main/java/com/psaravan/filebrowserview/lib/FileBrowserEngine/FileBrowserEngine.java
+++ b/library/src/main/java/com/psaravan/filebrowserview/lib/FileBrowserEngine/FileBrowserEngine.java
@@ -129,12 +129,14 @@ public AdapterData loadDir(File directory) {
                         try {
                             String path = file.getCanonicalPath();
 
-                            //Check if the file ends with an excluded extension.
-                            String[] splits = path.split(".");
-                            if (mFileBrowserView.getFileExtensionFilter()
-                                                .getFilterMap()
-                                                .containsKey("." + splits[splits.length-1]))
-                                continue;
+                            if(mFileBrowserView.getFileExtensionFilter() != null) {
+                                //Check if the file ends with an excluded extension.
+                                String[] splits = path.split(".");
+                                if (mFileBrowserView.getFileExtensionFilter()
+                                        .getFilterMap()
+                                        .containsKey("." + splits[splits.length - 1]))
+                                    continue;
+                            }
 
                             pathsList.add(path);
                         } catch (IOException e) {
diff --git a/library/src/main/java/com/psaravan/filebrowserview/lib/GridLayout/GridLayoutView.java b/library/src/main/java/com/psaravan/filebrowserview/lib/GridLayout/GridLayoutView.java
index 5d85955..b6cc6a6 100644
--- a/library/src/main/java/com/psaravan/filebrowserview/lib/GridLayout/GridLayoutView.java
+++ b/library/src/main/java/com/psaravan/filebrowserview/lib/GridLayout/GridLayoutView.java
@@ -62,7 +62,7 @@ public GridLayoutView init(ViewGroup viewGroup) {
         mAbsListView = (GridView) viewGroup.findViewById(R.id.file_browser_grid_view);
 
         //Display the default dir.
-        showDir(mFileBrowserView.getDefaultDirectory());
+        openFileSystemItem(mFileBrowserView.getDefaultDirectory());
         return this;
     }
 
@@ -72,33 +72,40 @@ public GridLayoutView init(ViewGroup viewGroup) {
      * @param directory The File object that points to the directory to load.
      */
     @Override
-    protected void showDir(File directory) {
+    protected void openFileSystemItem(File directory) {
 
-        //Call the interface callback method.
-        if (mNavigationInterface!=null)
-            mNavigationInterface.onNewDirLoaded(directory);
+        if(directory.isDirectory()) {
+            //Call the interface callback method.
+            if (mNavigationInterface != null)
+                mNavigationInterface.onNewDirLoaded(directory);
 
-        //Grab the directory's data to feed to the grid adapter.
-        AdapterData adapterData = mFileBrowserView.getFileBrowserEngine().loadDir(directory);
+            //Grab the directory's data to feed to the grid adapter.
+            AdapterData adapterData = mFileBrowserView.getFileBrowserEngine().loadDir(directory);
 
-        //Check if the user wants to use a custom adapter.
-        if (mFileBrowserView.getFileBrowserAdapter()!=null) {
-            //The user called setFileBrowserAdapter() and is using a custom adapter.
-            mFileBrowserView.getFileBrowserAdapter().setAdapterData(adapterData);
+            //Check if the user wants to use a custom adapter.
+            if (mFileBrowserView.getFileBrowserAdapter() != null) {
+                //The user called setFileBrowserAdapter() and is using a custom adapter.
+                mFileBrowserView.getFileBrowserAdapter().setAdapterData(adapterData);
 
-        } else {
-            //Nope, no custom adapter, so fall back to the default adapter.
-            GridLayoutAdapter adapter = new GridLayoutAdapter(mContext, mFileBrowserView, adapterData);
-            mFileBrowserView.setCustomAdapter(adapter);
+            } else {
+                //Nope, no custom adapter, so fall back to the default adapter.
+                GridLayoutAdapter adapter = new GridLayoutAdapter(mContext, mFileBrowserView, adapterData);
+                mFileBrowserView.setCustomAdapter(adapter);
 
-        }
+            }
 
-        //Apply the adapter to the GridView.
-        mAbsListView.setAdapter(mFileBrowserView.getFileBrowserAdapter());
+            //Apply the adapter to the GridView.
+            mAbsListView.setAdapter(mFileBrowserView.getFileBrowserAdapter());
 
-        //Apply the click listener to the GridView.
-        mAbsListView.setOnItemClickListener(onItemClickListener);
+            //Apply the click listener to the GridView.
+            mAbsListView.setOnItemClickListener(onItemClickListener);
+        }
+        else
+        {
+            if (mNavigationInterface != null)
+                mNavigationInterface.onFileOpened(directory);
 
+        }
     }
 
     /**
@@ -113,7 +120,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
             try {
                 String newPath = mFileBrowserView.getFileBrowserAdapter().getPathsList().get(position);
                 file = new File(newPath);
-                showDir(file);
+                openFileSystemItem(file);
 
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/library/src/main/java/com/psaravan/filebrowserview/lib/ListLayout/ListLayoutView.java b/library/src/main/java/com/psaravan/filebrowserview/lib/ListLayout/ListLayoutView.java
index f0e61a2..2a2c87e 100644
--- a/library/src/main/java/com/psaravan/filebrowserview/lib/ListLayout/ListLayoutView.java
+++ b/library/src/main/java/com/psaravan/filebrowserview/lib/ListLayout/ListLayoutView.java
@@ -62,43 +62,49 @@ public ListLayoutView init(ViewGroup viewGroup) {
         mAbsListView = (ListView) viewGroup.findViewById(R.id.file_browser_list_view);
 
         //Display the default dir.
-        showDir(mFileBrowserView.getDefaultDirectory());
+        openFileSystemItem(mFileBrowserView.getDefaultDirectory());
         return this;
     }
 
     /**
      * Loads the directory structure of the specified dir and sets the ListView's adapter.
      *
-     * @param directory The File object that points to the directory to load.
+     * @param fileSystemItem The File object that points to the directory to load.
      */
     @Override
-    protected void showDir(File directory) {
+    protected void openFileSystemItem(File fileSystemItem) {
 
-        //Call the interface callback method.
-        if (mNavigationInterface!=null)
-            mNavigationInterface.onNewDirLoaded(directory);
+        if(fileSystemItem.isDirectory()) {
+            //Call the interface callback method.
+            if (mNavigationInterface != null)
+                mNavigationInterface.onNewDirLoaded(fileSystemItem);
 
-        //Grab the directory's data to feed to the list adapter.
-        AdapterData adapterData = mFileBrowserView.getFileBrowserEngine().loadDir(directory);
+            //Grab the directory's data to feed to the list adapter.
+            AdapterData adapterData = mFileBrowserView.getFileBrowserEngine().loadDir(fileSystemItem);
 
-        //Check if the user wants to use a custom adapter.
-        if (mFileBrowserView.getFileBrowserAdapter()!=null) {
-            //The user called setFileBrowserAdapter() and is using a custom adapter.
-            mFileBrowserView.getFileBrowserAdapter().setAdapterData(adapterData);
+            //Check if the user wants to use a custom adapter.
+            if (mFileBrowserView.getFileBrowserAdapter() != null) {
+                //The user called setFileBrowserAdapter() and is using a custom adapter.
+                mFileBrowserView.getFileBrowserAdapter().setAdapterData(adapterData);
 
-        } else {
-            //Nope, no custom adapter, so fall back to the default adapter.
-            ListLayoutAdapter adapter = new ListLayoutAdapter(mContext, mFileBrowserView, adapterData);
-            mFileBrowserView.setCustomAdapter(adapter);
+            } else {
+                //Nope, no custom adapter, so fall back to the default adapter.
+                ListLayoutAdapter adapter = new ListLayoutAdapter(mContext, mFileBrowserView, adapterData);
+                mFileBrowserView.setCustomAdapter(adapter);
 
-        }
-
-        //Apply the adapter to the ListView.
-        mAbsListView.setAdapter(mFileBrowserView.getFileBrowserAdapter());
+            }
 
-        //Apply the click listener to the ListView.
-        mAbsListView.setOnItemClickListener(onItemClickListener);
+            //Apply the adapter to the ListView.
+            mAbsListView.setAdapter(mFileBrowserView.getFileBrowserAdapter());
 
+            //Apply the click listener to the ListView.
+            mAbsListView.setOnItemClickListener(onItemClickListener);
+        }
+        else
+        {
+            if (mNavigationInterface != null)
+                mNavigationInterface.onFileOpened(fileSystemItem);
+        }
     }
 
     /**
@@ -113,7 +119,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
             try {
                 String newPath = mFileBrowserView.getFileBrowserAdapter().getPathsList().get(position);
                 file = new File(newPath);
-                showDir(file);
+                openFileSystemItem(file);
 
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/library/src/main/java/com/psaravan/filebrowserview/lib/View/BaseLayoutView.java b/library/src/main/java/com/psaravan/filebrowserview/lib/View/BaseLayoutView.java
index 81a195f..b209ed0 100644
--- a/library/src/main/java/com/psaravan/filebrowserview/lib/View/BaseLayoutView.java
+++ b/library/src/main/java/com/psaravan/filebrowserview/lib/View/BaseLayoutView.java
@@ -62,7 +62,7 @@ public BaseLayoutView(Context context, AttributeSet attributeSet) {
      *
      * @param directory The File object that points to the directory to load.
      */
-    protected abstract void showDir(File directory);
+    protected abstract void openFileSystemItem(File directory);
 
     /**
      * Sets the navigation interface instance for this view.
diff --git a/library/src/main/res/layout/tabbed_browser_container.xml b/library/src/main/res/layout/tabbed_browser_container.xml
index 95a3fdc..285c1e7 100644
--- a/library/src/main/res/layout/tabbed_browser_container.xml
+++ b/library/src/main/res/layout/tabbed_browser_container.xml
@@ -45,7 +45,7 @@
                     android:layout_alignBottom="@+id/tab_widget_horiz_scroll_view"
                     android:layout_alignTop="@+id/tab_widget_horiz_scroll_view"
                     android:scaleType="centerInside"
-                    android:src="@+drawable/ic_action_new" />
+                    android:src="@drawable/ic_action_new" />
 
             </RelativeLayout>