diff --git a/README.md b/README.md
index 65d2839..f48a6df 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If your app
 
 * As of now, It is only available in jCenter(), So just put this in your app dependencies:
 ```gradle
-    implementation 'com.droidninja:filepicker:2.2.4'
+    implementation 'com.droidninja:filepicker:2.2.5'
 ```
 There is a method `getFilePath` in `ContentUriUtils` class through you can get the file path from Uri. e.g.
 
@@ -128,8 +128,9 @@ String zipTypes = {"zip","rar"};
     addFileSupport("ZIP",zipTypes, R.drawable.ic_zip_icon);
 ```
 
-#Styling
-Just override these styles in your main module to change colors and themes. 
+# Styling
+
+Just override these styles in your main module to change colors and themes.
 
 - If you have dark theme colors, just use `LibAppTheme.Dark`
 - If you have light theme colors, just use `LibAppTheme`
@@ -163,8 +164,8 @@ Just override these styles in your main module to change colors and themes.
            <item name="tabGravity">fill</item>
            <item name="tabMaxWidth">0dp</item>
        </style>
-       
-       
+
+
        <style name="ToolbarTheme" parent="Widget.MaterialComponents.Toolbar.Primary">
                <item name="materialThemeOverlay">@style/ThemeOverlay.App.Toolbar.Light</item>
                <item name="android:theme">@style/ThemeOverlay.App.Toolbar.Light</item>
diff --git a/app/src/main/java/vi/filepicker/MainActivity.java b/app/src/main/java/vi/filepicker/MainActivity.java
index c00c6fa..2f0bd51 100644
--- a/app/src/main/java/vi/filepicker/MainActivity.java
+++ b/app/src/main/java/vi/filepicker/MainActivity.java
@@ -182,11 +182,11 @@ public void onPickDoc() {
                     .setActivityTitle("Please select doc")
                     .setImageSizeLimit(5) //Provide Size in MB
                     .setVideoSizeLimit(20)
-                    .addFileSupport("ZIP", zips)
-                    .addFileSupport("AAC", pdfs, R.drawable.pdf_blue)
+//                    .addFileSupport("ZIP", zips)
+//                    .addFileSupport("AAC", pdfs, R.drawable.pdf_blue)
                     .enableDocSupport(true)
                     .enableSelectAll(true)
-                    .sortDocumentsBy(SortingTypes.name)
+                    .sortDocumentsBy(SortingTypes.NAME)
                     .withOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)
                     .pickFile(this);
         }
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
new file mode 100644
index 0000000..d5bf543
--- /dev/null
+++ b/app/src/main/res/values-it/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="rationale_doc_picker">L\'app ha bisogno di questo permesso per accedere ai documenti del dispositivo.</string>
+    <string name="rationale_photo_picker">L\'app ha bisogno di questo permesso per selezionare foto dalla galleria e dalla camera.</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1205d30..2a923e3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,8 +1,7 @@
 <resources>
-    <string name="app_name">Android FilePicker</string>
+    <string name="app_name" translatable="false">Android FilePicker</string>
 
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-  <string name="rationale_photo_picker">We require this permission to select photo from gallery and camera.</string>
-  <string name="rationale_doc_picker">We need this pemission to read documents from device.</string>
+    <string name="hello_blank_fragment" translatable="false">Hello blank fragment</string>
+    <string name="rationale_photo_picker">We require this permission to select photo from gallery and camera.</string>
+    <string name="rationale_doc_picker">We need this permission to read documents from device.</string>
 </resources>
diff --git a/build.gradle b/build.gradle
index fe0846f..49b770f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,3 +27,7 @@ allprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+subprojects {
+    tasks.withType(Javadoc).all { enabled = false }
+}
diff --git a/filepicker/build.gradle b/filepicker/build.gradle
index b925f99..ed80c0a 100644
--- a/filepicker/build.gradle
+++ b/filepicker/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: "com.jfrog.bintray"
 
-version = "2.2.4"
+version = "2.2.5"
 
 android {
     compileSdkVersion 30
@@ -86,6 +86,7 @@ task javadoc(type: Javadoc) {
     excludes = ['**/*.kt']
     options.addStringOption('Xdoclint:none', '-quiet')
     options.addStringOption('encoding', 'UTF-8')
+    options.addStringOption('charSet', 'UTF-8')
     source = android.sourceSets.main.java.srcDirs
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
 }
@@ -94,6 +95,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
     classifier = 'javadoc'
     from javadoc.destinationDir
 }
+
 artifacts {
     archives javadocJar
     archives sourcesJar
diff --git a/filepicker/src/main/java/droidninja/filepicker/MediaDetailsActivity.kt b/filepicker/src/main/java/droidninja/filepicker/MediaDetailsActivity.kt
index 3ae9b85..ffec6ef 100644
--- a/filepicker/src/main/java/droidninja/filepicker/MediaDetailsActivity.kt
+++ b/filepicker/src/main/java/droidninja/filepicker/MediaDetailsActivity.kt
@@ -11,6 +11,7 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.widget.TextView
+import androidx.core.widget.ContentLoadingProgressBar
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import com.bumptech.glide.Glide
@@ -27,6 +28,7 @@ import java.util.Comparator
 class MediaDetailsActivity : BaseFilePickerActivity(), FileAdapterListener {
     private var recyclerView: RecyclerView? = null
     private var emptyView: TextView? = null
+    private lateinit var progressBar: ContentLoadingProgressBar
     private lateinit var mGlideRequestManager: RequestManager
     private var photoGridAdapter: PhotoGridAdapter? = null
     private var fileType: Int = 0
@@ -74,6 +76,8 @@ class MediaDetailsActivity : BaseFilePickerActivity(), FileAdapterListener {
     }
 
     private fun setUpView() {
+        progressBar = findViewById(R.id.progressbar)
+        progressBar.visibility = View.VISIBLE
         recyclerView = findViewById(R.id.recyclerview)
         emptyView = findViewById(R.id.empty_view)
 
@@ -108,6 +112,7 @@ class MediaDetailsActivity : BaseFilePickerActivity(), FileAdapterListener {
     }
 
     private fun updateList(medias: List<Media>) {
+        progressBar.visibility = View.GONE
         if (medias.isNotEmpty()) {
             emptyView?.visibility = View.GONE
             recyclerView?.visibility = View.VISIBLE
diff --git a/filepicker/src/main/java/droidninja/filepicker/PickerManager.kt b/filepicker/src/main/java/droidninja/filepicker/PickerManager.kt
index 37556fd..0249493 100644
--- a/filepicker/src/main/java/droidninja/filepicker/PickerManager.kt
+++ b/filepicker/src/main/java/droidninja/filepicker/PickerManager.kt
@@ -16,7 +16,7 @@ object PickerManager {
     private var maxCount = FilePickerConst.DEFAULT_MAX_COUNT
     private var showImages = true
     var cameraDrawable = R.drawable.ic_camera
-    var sortingType = SortingTypes.none
+    var sortingType = SortingTypes.NONE
 
     val selectedPhotos: ArrayList<Uri> = ArrayList()
     val selectedFiles: ArrayList<Uri> = ArrayList()
diff --git a/filepicker/src/main/java/droidninja/filepicker/fragments/MediaDetailPickerFragment.kt b/filepicker/src/main/java/droidninja/filepicker/fragments/MediaDetailPickerFragment.kt
index 9772586..f835b32 100644
--- a/filepicker/src/main/java/droidninja/filepicker/fragments/MediaDetailPickerFragment.kt
+++ b/filepicker/src/main/java/droidninja/filepicker/fragments/MediaDetailPickerFragment.kt
@@ -7,6 +7,7 @@ import android.os.Bundle
 import android.view.*
 import android.widget.TextView
 import android.widget.Toast
+import androidx.core.widget.ContentLoadingProgressBar
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DefaultItemAnimator
@@ -35,7 +36,7 @@ class MediaDetailPickerFragment : BaseFragment(), FileAdapterListener {
 
     lateinit var emptyView: TextView
     lateinit var viewModel: VMMediaPicker
-
+    private lateinit var progressBar: ContentLoadingProgressBar
     private var mListener: PhotoPickerFragmentListener? = null
     private var photoGridAdapter: PhotoGridAdapter? = null
     private var imageCaptureManager: ImageCaptureManager? = null
@@ -91,6 +92,8 @@ class MediaDetailPickerFragment : BaseFragment(), FileAdapterListener {
     }
 
     private fun initView(view: View) {
+        progressBar = view.findViewById(R.id.progressbar)
+        progressBar.visibility = View.VISIBLE
         recyclerView = view.findViewById(R.id.recyclerview)
         emptyView = view.findViewById(R.id.empty_view)
         arguments?.let {
@@ -138,6 +141,7 @@ class MediaDetailPickerFragment : BaseFragment(), FileAdapterListener {
 
     private fun updateList(medias: List<Media>) {
         view?.let { _ ->
+            progressBar.visibility = View.GONE
             if (medias.isNotEmpty()) {
                 emptyView.visibility = View.GONE
             } else {
diff --git a/filepicker/src/main/java/droidninja/filepicker/fragments/MediaFolderPickerFragment.kt b/filepicker/src/main/java/droidninja/filepicker/fragments/MediaFolderPickerFragment.kt
index 78c960f..73046ea 100644
--- a/filepicker/src/main/java/droidninja/filepicker/fragments/MediaFolderPickerFragment.kt
+++ b/filepicker/src/main/java/droidninja/filepicker/fragments/MediaFolderPickerFragment.kt
@@ -12,6 +12,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import android.widget.Toast
+import androidx.core.widget.ContentLoadingProgressBar
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import com.bumptech.glide.Glide
@@ -36,7 +37,7 @@ class MediaFolderPickerFragment : BaseFragment(), FolderGridAdapter.FolderGridAd
 
     lateinit var emptyView: TextView
     lateinit var viewModel: VMMediaPicker
-
+    private lateinit var progressBar: ContentLoadingProgressBar
     private var mListener: PhotoPickerFragmentListener? = null
     private var photoGridAdapter: FolderGridAdapter? = null
     private var imageCaptureManager: ImageCaptureManager? = null
@@ -78,6 +79,8 @@ class MediaFolderPickerFragment : BaseFragment(), FolderGridAdapter.FolderGridAd
     }
 
     private fun initView(view: View) {
+        progressBar = view.findViewById(R.id.progressbar)
+        progressBar.visibility = View.VISIBLE
         recyclerView = view.findViewById(R.id.recyclerview)
         emptyView = view.findViewById(R.id.empty_view)
         arguments?.let {
@@ -128,6 +131,7 @@ class MediaFolderPickerFragment : BaseFragment(), FolderGridAdapter.FolderGridAd
 
     private fun updateList(dirs: List<PhotoDirectory>) {
         view?.let {
+            progressBar.visibility = View.GONE
             if (dirs.isNotEmpty()) {
                 emptyView.visibility = View.GONE
                 recyclerView.visibility = View.VISIBLE
@@ -166,9 +170,11 @@ class MediaFolderPickerFragment : BaseFragment(), FolderGridAdapter.FolderGridAd
 
     override fun onFolderClicked(photoDirectory: PhotoDirectory) {
         val intent = Intent(activity, MediaDetailsActivity::class.java)
-        intent.putExtra(PhotoDirectory::class.java.simpleName, photoDirectory.apply {
-            medias.clear()
-        })
+        val intentPhotoDir = PhotoDirectory(bucketId = photoDirectory.bucketId,name = photoDirectory.name)
+        intent.putExtra(PhotoDirectory::class.java.simpleName, intentPhotoDir)
+//        intent.putExtra(PhotoDirectory::class.java.simpleName, photoDirectory.apply {
+//            medias.clear()
+//        })
         intent.putExtra(FilePickerConst.EXTRA_FILE_TYPE, fileType)
         intent.putExtra(FilePickerConst.EXTRA_IMAGE_FILE_SIZE, imageFileSize)
         intent.putExtra(FilePickerConst.EXTRA_VIDEO_FILE_SIZE, videoFileSize)
diff --git a/filepicker/src/main/java/droidninja/filepicker/models/sort/NameComparator.java b/filepicker/src/main/java/droidninja/filepicker/models/sort/NameComparator.java
deleted file mode 100644
index 13c51e9..0000000
--- a/filepicker/src/main/java/droidninja/filepicker/models/sort/NameComparator.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package droidninja.filepicker.models.sort;
-
-import java.util.Comparator;
-
-import droidninja.filepicker.models.Document;
-
-/**
- * Created by gabriel on 10/2/17.
- */
-
-public class NameComparator implements Comparator<Document> {
-
-    protected NameComparator() { }
-
-    @Override
-    public int compare(Document o1, Document o2) {
-        return o1.getName().toLowerCase().compareTo(o2.getName().toLowerCase());
-    }
-}
diff --git a/filepicker/src/main/java/droidninja/filepicker/models/sort/NameComparator.kt b/filepicker/src/main/java/droidninja/filepicker/models/sort/NameComparator.kt
new file mode 100644
index 0000000..54829cb
--- /dev/null
+++ b/filepicker/src/main/java/droidninja/filepicker/models/sort/NameComparator.kt
@@ -0,0 +1,13 @@
+package droidninja.filepicker.models.sort
+
+import droidninja.filepicker.models.Document
+import java.util.*
+
+/**
+ * Created by gabriel on 10/2/17.
+ */
+class NameComparator : Comparator<Document> {
+    override fun compare(o1: Document, o2: Document): Int {
+        return o1.name.toLowerCase(Locale.getDefault()).compareTo(o2.name.toLowerCase(Locale.getDefault()))
+    }
+}
\ No newline at end of file
diff --git a/filepicker/src/main/java/droidninja/filepicker/models/sort/SortingTypes.java b/filepicker/src/main/java/droidninja/filepicker/models/sort/SortingTypes.java
deleted file mode 100644
index 92f7607..0000000
--- a/filepicker/src/main/java/droidninja/filepicker/models/sort/SortingTypes.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package droidninja.filepicker.models.sort;
-
-import java.util.Comparator;
-
-import droidninja.filepicker.models.Document;
-
-/**
- * Created by gabriel on 10/2/17.
- */
-
-public enum SortingTypes {
-    name(new NameComparator()), none(null);
-
-    final private Comparator<Document> comparator;
-
-    SortingTypes(Comparator<Document> comparator) {
-        this.comparator = comparator;
-    }
-
-    public Comparator<Document> getComparator() {
-        return comparator;
-    }
-}
diff --git a/filepicker/src/main/java/droidninja/filepicker/models/sort/SortingTypes.kt b/filepicker/src/main/java/droidninja/filepicker/models/sort/SortingTypes.kt
new file mode 100644
index 0000000..bcaadd3
--- /dev/null
+++ b/filepicker/src/main/java/droidninja/filepicker/models/sort/SortingTypes.kt
@@ -0,0 +1,11 @@
+package droidninja.filepicker.models.sort
+
+import droidninja.filepicker.models.Document
+import java.util.*
+
+/**
+ * Created by gabriel on 10/2/17.
+ */
+enum class SortingTypes(val comparator: Comparator<Document>?) {
+    NAME(NameComparator()), NONE(null);
+}
\ No newline at end of file
diff --git a/filepicker/src/main/res/layout/activity_media_details.xml b/filepicker/src/main/res/layout/activity_media_details.xml
index 0bb5a88..ba21b06 100644
--- a/filepicker/src/main/res/layout/activity_media_details.xml
+++ b/filepicker/src/main/res/layout/activity_media_details.xml
@@ -26,6 +26,14 @@
         android:layout_below="@+id/appbar_layout"
         android:background="@android:color/white" />
 
+    <androidx.core.widget.ContentLoadingProgressBar
+        style="?android:attr/progressBarStyleLarge"
+        android:id="@+id/progressbar"
+        android:layout_centerInParent="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"/>
+
     <TextView
         android:id="@+id/empty_view"
         android:layout_width="match_parent"
diff --git a/filepicker/src/main/res/layout/fragment_media_folder_picker.xml b/filepicker/src/main/res/layout/fragment_media_folder_picker.xml
index ede67f4..d291066 100644
--- a/filepicker/src/main/res/layout/fragment_media_folder_picker.xml
+++ b/filepicker/src/main/res/layout/fragment_media_folder_picker.xml
@@ -8,6 +8,14 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent" />
 
+    <androidx.core.widget.ContentLoadingProgressBar
+        style="?android:attr/progressBarStyleLarge"
+        android:id="@+id/progressbar"
+        android:layout_centerInParent="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"/>
+
     <TextView
         android:id="@+id/empty_view"
         android:layout_width="match_parent"
diff --git a/filepicker/src/main/res/layout/fragment_photo_picker.xml b/filepicker/src/main/res/layout/fragment_photo_picker.xml
index b18da09..e2580dd 100644
--- a/filepicker/src/main/res/layout/fragment_photo_picker.xml
+++ b/filepicker/src/main/res/layout/fragment_photo_picker.xml
@@ -9,6 +9,14 @@
         android:layout_height="fill_parent"
         />
 
+    <androidx.core.widget.ContentLoadingProgressBar
+        style="?android:attr/progressBarStyleLarge"
+        android:id="@+id/progressbar"
+        android:layout_centerInParent="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"/>
+
     <TextView
         android:id="@+id/empty_view"
         android:layout_width="match_parent"