diff --git a/res/layout/main.xml b/res/layout/main.xml
index 2b1a95e2..842378f6 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -7,9 +7,9 @@
     <TextView
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        
-        android:text="@string/hello" />
-

+        android:text="@string/hello"
+        />
+    
     <Button
         android:id="@+id/startFileBrowserButtonID"
         android:layout_width="fill_parent"
diff --git a/res/layout/prompts_holo.xml b/res/layout/prompts_holo.xml
new file mode 100644
index 00000000..fc50cc24
--- /dev/null
+++ b/res/layout/prompts_holo.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_marginBottom="5dp" >
+
+    <View
+        android:id="@+id/titleDivider"
+        android:layout_alignParentTop="true"
+        android:layout_width="fill_parent"
+        android:layout_height="2dip"
+        android:background="#33B5E5" />
+
+    <EditText
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+         android:layout_marginTop="15dp"
+        android:layout_below="@id/titleDivider"
+        android:id="@+id/editTextDialogUserInput"
+         />
+
+</RelativeLayout>
diff --git a/res/layout/ua_com_vassiliev_filebrowser_layout.xml b/res/layout/ua_com_vassiliev_filebrowser_layout.xml
index 4c755c61..a568ecf8 100644
--- a/res/layout/ua_com_vassiliev_filebrowser_layout.xml
+++ b/res/layout/ua_com_vassiliev_filebrowser_layout.xml
@@ -10,20 +10,31 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal" >
 
-        <Button
+        <ImageButton
             android:id="@+id/upDirectoryButton"
-            android:layout_width="fill_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:drawableLeft="@drawable/dir_up"
-            android:text="Up" />
+            android:layout_weight="0.5"
+            android:src="@drawable/dir_up"
+            android:text=""
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <Button
+            android:id="@+id/newDirectoryButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5"
+            android:text="+"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+             />
 
         <Button
             android:id="@+id/selectCurrentDirectoryButton"
-            android:layout_width="fill_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="Select" />
+            android:text="Select"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
     </LinearLayout>
 
     <TextView
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 17fdb8e1..a78e1ecb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3,5 +3,9 @@
 
     <string name="hello">AndroidFileBrowserExampleActivity</string>
     <string name="app_name">Android File Browser Example</string>
+    <string name="alert_chooseName">Choose a directory name</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Cancel</string>
+    <string name="default_directoryname">Unnamed</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/src/ua/com/vassiliev/androidfilebrowser/FileBrowserActivity.java b/src/ua/com/vassiliev/androidfilebrowser/FileBrowserActivity.java
index 316e5e18..3f27ac7e 100644
--- a/src/ua/com/vassiliev/androidfilebrowser/FileBrowserActivity.java
+++ b/src/ua/com/vassiliev/androidfilebrowser/FileBrowserActivity.java
@@ -1,4 +1,5 @@
 package ua.com.vassiliev.androidfilebrowser;
+
 //Heavily based on code from
 //https://github.com/mburman/Android-File-Explore
 //	Version of Aug 13, 2011
@@ -10,108 +11,101 @@
 //General Java imports 
 import java.io.File;
 import java.io.FilenameFilter;
+import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Collections;
 
-//Android imports 
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Configuration;
-//import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Environment;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
-
-
+//Android imports 
+//import android.content.res.ColorStateList;
 //Import of resources file for file browser
-import ua.com.vassiliev.androidfilebrowser.R;
 
+public class FileBrowserActivity extends Activity {
+	// Intent Action Constants
+	public static final String INTENT_ACTION_SELECT_DIR = "ua.com.vassiliev.androidfilebrowser.SELECT_DIRECTORY_ACTION";
+	public static final String INTENT_ACTION_SELECT_FILE = "ua.com.vassiliev.androidfilebrowser.SELECT_FILE_ACTION";
 
+	// Intent parameters names constants
+	public static final String startDirectoryParameter = "ua.com.vassiliev.androidfilebrowser.directoryPath";
+	public static final String returnDirectoryParameter = "ua.com.vassiliev.androidfilebrowser.directoryPathRet";
+	public static final String returnFileParameter = "ua.com.vassiliev.androidfilebrowser.filePathRet";
+	public static final String showCannotReadParameter = "ua.com.vassiliev.androidfilebrowser.showCannotRead";
 
-public class FileBrowserActivity extends Activity {
-	//Intent Action Constants
-	public static final String INTENT_ACTION_SELECT_DIR = 
-			"ua.com.vassiliev.androidfilebrowser.SELECT_DIRECTORY_ACTION";
-	public static final String INTENT_ACTION_SELECT_FILE = 
-			"ua.com.vassiliev.androidfilebrowser.SELECT_FILE_ACTION";
-	
-	//Intent parameters names constants
-	public static final String startDirectoryParameter = 
-			"ua.com.vassiliev.androidfilebrowser.directoryPath";
-	public static final String returnDirectoryParameter = 
-			"ua.com.vassiliev.androidfilebrowser.directoryPathRet";
-	public static final String returnFileParameter = 
-			"ua.com.vassiliev.androidfilebrowser.filePathRet";
-	public static final String showCannotReadParameter = 
-			"ua.com.vassiliev.androidfilebrowser.showCannotRead";
-	
-	
-	
 	// Stores names of traversed directories
 	ArrayList<String> pathDirsList = new ArrayList<String>();
 
 	// Check if the first level of the directory structure is the one showing
-	//private Boolean firstLvl = true;
+	// private Boolean firstLvl = true;
 
 	private static final String LOGTAG = "F_PATH";
 
 	private List<Item> fileList = new ArrayList<Item>();
 	private File path = null;
 	private String chosenFile;
-	//private static final int DIALOG_LOAD_FILE = 1000;
+
+	// private static final int DIALOG_LOAD_FILE = 1000;
 
 	ArrayAdapter<Item> adapter;
-	
+
 	private boolean showHiddenFilesAndDirs = true;
-	
+
 	private boolean directoryShownIsEmpty = false;
-	
-	//Action constants
+
+	// Action constants
 	private static int currentAction = -1;
 	private static final int SELECT_DIRECTORY = 1;
 	private static final int SELECT_FILE = 2;
-	
-	
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		//In case of ua.com.vassiliev.androidfilebrowser.SELECT_DIRECTORY_ACTION
-		//Expects com.mburman.fileexplore.directoryPath parameter to 
+		// In case of
+		// ua.com.vassiliev.androidfilebrowser.SELECT_DIRECTORY_ACTION
+		// Expects com.mburman.fileexplore.directoryPath parameter to
 		// point to the start folder.
 		// If empty or null, will start from SDcard root.
 		setContentView(R.layout.ua_com_vassiliev_filebrowser_layout);
-		
-		//Set action for this activity
+
+		// Set action for this activity
 		Intent thisInt = this.getIntent();
-		currentAction = SELECT_DIRECTORY;//This would be a default action in case not set by intent
-//		if(thisInt.getAction().equalsIgnoreCase(INTENT_ACTION_SELECT_DIR)) {
-//			currentAction = SELECT_DIRECTORY;
-//		}
-		if(thisInt.getAction().equalsIgnoreCase(INTENT_ACTION_SELECT_FILE)) {
+		currentAction = SELECT_DIRECTORY;// This would be a default action in
+											// case not set by intent
+
+		if (thisInt.getAction().equalsIgnoreCase(INTENT_ACTION_SELECT_FILE)) {
 			Log.d(LOGTAG, "SELECT ACTION - SELECT FILE");
 			currentAction = SELECT_FILE;
 		}
-		
-		showHiddenFilesAndDirs = 
-				thisInt.getBooleanExtra(showCannotReadParameter, true);
-		
+
+		showHiddenFilesAndDirs = thisInt.getBooleanExtra(
+				showCannotReadParameter, true);
+
 		setInitialDirectory();
-		
-		parceDirectoryPath();
+
+		parseDirectoryPath();
 		loadFileList();
 		this.createFileListAdapter();
 		this.initializeButtons();
@@ -119,187 +113,241 @@ public void onCreate(Bundle savedInstanceState) {
 		updateCurrentDirectoryTextView();
 		Log.d(LOGTAG, path.getAbsolutePath());
 	}
-	
-	
+
 	private void setInitialDirectory() {
-		//this.path = Environment.getExternalStorageDirectory();
+
 		Intent thisInt = this.getIntent();
-		String requestedStartDir = 
-				thisInt.getStringExtra(startDirectoryParameter);
-		
-		if(requestedStartDir!=null 
-				&& 
-		   requestedStartDir.length()>0
-		) {//if(requestedStartDir!=null
+		String requestedStartDir = thisInt
+				.getStringExtra(startDirectoryParameter);
+
+		if (requestedStartDir != null && requestedStartDir.length() > 0) {
 			File tempFile = new File(requestedStartDir);
-			if(tempFile.isDirectory())
+			if (tempFile.isDirectory())
 				this.path = tempFile;
-		}//if(requestedStartDir!=null
-		
-		if(this.path==null) {//No or invalid directory supplied in intent parameter
-			if(Environment.getExternalStorageDirectory().isDirectory()
-					&&
-			   Environment.getExternalStorageDirectory().canRead())
+		}
+
+		if (this.path == null) {// No or invalid directory supplied in intent
+								// parameter
+			if (Environment.getExternalStorageDirectory().isDirectory()
+					&& Environment.getExternalStorageDirectory().canRead())
 				path = Environment.getExternalStorageDirectory();
 			else
 				path = new File("/");
-		}//if(this.path==null) {//No or invalid directory supplied in intent parameter
-	}//private void setInitialDirectory() {
-	
-	
-	private void parceDirectoryPath() {
+		}
+	}
+
+	private void parseDirectoryPath() {
 		pathDirsList.clear();
 		String pathString = path.getAbsolutePath();
 		String[] parts = pathString.split("/");
-		int i=0;
-		while(i<parts.length) {
+		int i = 0;
+		while (i < parts.length) {
 			pathDirsList.add(parts[i]);
 			i++;
 		}
-//		if(pathDirsList.size()>0) 
-//			firstLvl = false;
-//		else	firstLvl = true;
 	}
-	
+
 	private void initializeButtons() {
-		Button upDirButton = (Button)this.findViewById(R.id.upDirectoryButton);
-		upDirButton.setOnClickListener(
-			new OnClickListener() {
+		ImageButton upDirButton = (ImageButton) this
+				.findViewById(R.id.upDirectoryButton);
+		upDirButton.setOnClickListener(new OnClickListener() {
+			public void onClick(View v) {
+				Log.d(LOGTAG, "onclick for upDirButton");
+				loadDirectoryUp();
+				loadFileList();
+				adapter.notifyDataSetChanged();
+				updateCurrentDirectoryTextView();
+			}
+		});
+
+		Button selectFolderButton = (Button) this
+				.findViewById(R.id.selectCurrentDirectoryButton);
+		if (currentAction == FileBrowserActivity.SELECT_DIRECTORY) {
+			selectFolderButton.setOnClickListener(new OnClickListener() {
 				public void onClick(View v) {
-					Log.d(LOGTAG, "onclick for upDirButton");
-					loadDirectoryUp();
-					loadFileList();
-					adapter.notifyDataSetChanged();
-					updateCurrentDirectoryTextView();
+					Log.d(LOGTAG, "onclick for selectFolderButton");
+					returnDirectoryFinishActivity();
 				}
-			});//upDirButton.setOnClickListener(
-		
-		Button selectFolderButton = (Button)this.findViewById(R.id.selectCurrentDirectoryButton);
-		if(currentAction == this.SELECT_DIRECTORY) {
-			selectFolderButton.setOnClickListener(
-				new OnClickListener() {
-					public void onClick(View v) {
-						Log.d(LOGTAG, "onclick for selectFolderButton");
-						returnDirectoryFinishActivity();
-					}
-				});//upDirButton.setOnClickListener(
-		} else {//if(currentAction == this.SELECT_DIRECTORY) {
+			});
+		} else {
 			selectFolderButton.setVisibility(View.GONE);
-//			((TextView)this.findViewById(
-//					R.id.currentDirectoryTextView)).setVisibility(View.GONE);
-		}//} else {//if(currentAction == this.SELECT_DIRECTORY) {
-	}//private void initializeButtons() {
-	
+
+		}
+
+		// new Folder button
+		Button newDirButton = (Button) this
+				.findViewById(R.id.newDirectoryButton);
+		newDirButton.setOnClickListener(new OnClickListener() {
+
+			public void onClick(View v) {
+				createDirectoryDialog();
+			}
+		});
+
+	}
+
 	private void loadDirectoryUp() {
 		// present directory removed from list
 		String s = pathDirsList.remove(pathDirsList.size() - 1);
 		// path modified to exclude present directory
 		path = new File(path.toString().substring(0,
 				path.toString().lastIndexOf(s)));
-		//fileList = null;
+
 		fileList.clear();
 		// if there are no more directories in the list, then
 		// its the first level
-//		if (pathDirsList.isEmpty()) {
-//			firstLvl = true;
-//		}
+
+	}
+
+	private void createDirectoryDialog() {
+
+		// inflate layout of AlertDialog content (with edit text)
+		LayoutInflater li = LayoutInflater.from(this);
+		View promptsView = li.inflate(R.layout.prompts_holo, null);
+		final EditText etNewName = (EditText) promptsView
+				.findViewById(R.id.editTextDialogUserInput);
+		etNewName.setText(getString(R.string.default_directoryname)); // set
+																		// directory
+																		// name
+																		// to
+																		// some
+																		// default
+																		// value
+		etNewName.setSelectAllOnFocus(true);
+
+		AlertDialog.Builder builder = new AlertDialog.Builder(this);
+		builder.setView(promptsView);
+		builder.setCancelable(true)
+				.setMessage(R.string.alert_chooseName)
+				.setPositiveButton(R.string.ok,
+						new DialogInterface.OnClickListener() {
+
+							public void onClick(DialogInterface dialog,
+									int which) {
+								String tempText = etNewName.getText()
+										.toString();
+								if (tempText.equals("")) {
+									createDirectoryDialog();
+									dialog.cancel();
+								} else {
+									// create directory and load new views
+									createNewDirectory(tempText);
+								}
+							}
+						})
+				.setNegativeButton(R.string.cancel,
+						new DialogInterface.OnClickListener() {
+
+							public void onClick(DialogInterface dialog,
+									int which) {
+								dialog.cancel();
+
+							}
+						});
+		builder.create().show();
+
+	}
+
+	private void createNewDirectory(String name) {
+		try {
+			String newPath = path.getAbsolutePath() + "/" + name;
+			File directory = new File(newPath);
+			directory.mkdir();
+
+			path = directory;
+			parseDirectoryPath();
+			loadFileList();
+			adapter.notifyDataSetChanged();
+			updateCurrentDirectoryTextView();
+			// fileList.clear();
+
+		} catch (NullPointerException e) {
+			e.printStackTrace();
+		}
+
 	}
-	
+
 	private void updateCurrentDirectoryTextView() {
-		int i=0;
+		int i = 0;
 		String curDirString = "";
-		while(i<pathDirsList.size()) {
-			curDirString +=pathDirsList.get(i)+"/";
+		while (i < pathDirsList.size()) {
+			curDirString += pathDirsList.get(i) + "/";
 			i++;
 		}
-		if(pathDirsList.size()==0) {
-			((Button)this.findViewById(R.id.upDirectoryButton)).setEnabled(false);
+		if (pathDirsList.size() == 0) {
+			((ImageButton) this.findViewById(R.id.upDirectoryButton))
+					.setEnabled(false);
 			curDirString = "/";
-		}
-		else ((Button)this.findViewById(R.id.upDirectoryButton)).setEnabled(true);
-		
-		//Log.d(TAG, "Will set curr dir to:"+curDirString);
-		((TextView)this.findViewById(
-				R.id.currentDirectoryTextView)).setText(
-				"Current directory:\n"+curDirString);
-	}//private void updateCurrentDirectoryTextView() {
-	
+		} else
+			((ImageButton) this.findViewById(R.id.upDirectoryButton))
+					.setEnabled(true);
+
+		// Log.d(TAG, "Will set curr dir to:"+curDirString);
+		((TextView) this.findViewById(R.id.currentDirectoryTextView))
+				.setText("Current directory:\n" + curDirString);
+	}
+
 	private void showToast(String message) {
 		Toast.makeText(this, message, Toast.LENGTH_LONG).show();
 	}
-	
-	
-	
+
 	private void initializeFileListView() {
-		ListView lView = (ListView)this.findViewById(R.id.fileListView);
+		ListView lView = (ListView) this.findViewById(R.id.fileListView);
 		lView.setBackgroundColor(Color.LTGRAY);
-		LinearLayout.LayoutParams lParam =
-				new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);
+		LinearLayout.LayoutParams lParam = new LinearLayout.LayoutParams(
+				LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);
 		lParam.setMargins(15, 5, 15, 5);
 		lView.setAdapter(this.adapter);
-		lView.setOnItemClickListener(
-				new AdapterView.OnItemClickListener() {
-					public void onItemClick(AdapterView parent, View view, int position, long id) {
-						chosenFile = fileList.get(position).file;
-						File sel = new File(path + "/" + chosenFile);
-						Log.d(LOGTAG, "Clicked:"+chosenFile);
-						if (sel.isDirectory()) {
-							if(sel.canRead()) {
-								//firstLvl = false;
-								// Adds chosen directory to list
-								pathDirsList.add(chosenFile);
-								path = new File(sel + "");
-								Log.d(LOGTAG, "Just reloading the list");
-								//returnDirectoryFinishActivity();
-								loadFileList();
-								adapter.notifyDataSetChanged();
-								updateCurrentDirectoryTextView();
-								Log.d(LOGTAG, path.getAbsolutePath());
-							} else {//if(sel.canRead()) {
-								showToast("Path does not exist or cannot be read");
-							}//} else {//if(sel.canRead()) {
-						}//if (sel.isDirectory()) {
-						// Checks if 'up' was clicked
-//						else if (chosenFile.equalsIgnoreCase("up") && !sel.exists()) {
-//							//Below is not needed as there is a separate "Up" button
-////							loadDirectoryUp();
-////							loadFileList();
-////							adapter.notifyDataSetChanged();
-////							Log.d(TAG, path.getAbsolutePath());
-//						}
-						// File picked or an empty directory message clicked
-						else {
-							Log.d("item clicked");
-							if(!directoryShownIsEmpty) {
-								Log.d(LOGTAG, "File selected:"+chosenFile);
-								returnFileFinishActivity(sel.getAbsolutePath());
-							}
-						}
-						//Log.d(TAG, "onClick finished");
-					}//public void onClick(DialogInterface dialog, int which) {
-				}//new OnItemClickListener() {
-		);//lView.setOnClickListener(
-	}//private void initializeFileListView() {
-	
+		lView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+			public void onItemClick(AdapterView parent, View view,
+					int position, long id) {
+				chosenFile = fileList.get(position).file;
+				File sel = new File(path + "/" + chosenFile);
+				Log.d(LOGTAG, "Clicked:" + chosenFile);
+				if (sel.isDirectory()) {
+					if (sel.canRead()) {
+						// firstLvl = false;
+						// Adds chosen directory to list
+						pathDirsList.add(chosenFile);
+						path = new File(sel + "");
+						Log.d(LOGTAG, "Just reloading the list");
+						// returnDirectoryFinishActivity();
+						loadFileList();
+						adapter.notifyDataSetChanged();
+						updateCurrentDirectoryTextView();
+						Log.d(LOGTAG, path.getAbsolutePath());
+					} else {// if(sel.canRead()) {
+						showToast("Path does not exist or cannot be read");
+					}
+				}
+				// }
+				// File picked or an empty directory message clicked
+				else {
+					Log.d(LOGTAG, "item clicked");
+					if (!directoryShownIsEmpty) {
+						Log.d(LOGTAG, "File selected:" + chosenFile);
+						returnFileFinishActivity(sel.getAbsolutePath());
+					}
+				}
+
+			}
+		});
+	}
+
 	private void returnDirectoryFinishActivity() {
 		Intent retIntent = new Intent();
-		retIntent.putExtra(
-				returnDirectoryParameter, 
-				path.getAbsolutePath()
-		);
+		retIntent.putExtra(returnDirectoryParameter, path.getAbsolutePath());
+		Log.d(LOGTAG, "returning path: " + path.getAbsolutePath());
 		this.setResult(RESULT_OK, retIntent);
 		this.finish();
-	}//END private void returnDirectoryFinishActivity() {
-	
+	}// END private void returnDirectoryFinishActivity() {
+
 	private void returnFileFinishActivity(String filePath) {
 		Intent retIntent = new Intent();
-		retIntent.putExtra(
-				returnFileParameter, 
-				filePath
-		);
+		retIntent.putExtra(returnFileParameter, filePath);
 		this.setResult(RESULT_OK, retIntent);
 		this.finish();
-	}//END private void returnDirectoryFinishActivity() {
+	}// END private void returnDirectoryFinishActivity() {
 
 	private void loadFileList() {
 		try {
@@ -313,111 +361,96 @@ private void loadFileList() {
 			FilenameFilter filter = new FilenameFilter() {
 				public boolean accept(File dir, String filename) {
 					File sel = new File(dir, filename);
-					boolean showReadableFile = showHiddenFilesAndDirs || sel.canRead();
+					boolean showReadableFile = showHiddenFilesAndDirs
+							|| sel.canRead();
 					// Filters based on whether the file is hidden or not
-					if(currentAction==SELECT_DIRECTORY) {
+					if (currentAction == SELECT_DIRECTORY) {
 						return (sel.isDirectory() && showReadableFile);
 					}
-					if(currentAction == SELECT_FILE) {
+					if (currentAction == SELECT_FILE) {
 						return (showReadableFile);
 					}
 					return true;
-//					return (sel.isFile() || sel.isDirectory())
-//							&& !sel.isHidden();
-				}//public boolean accept(File dir, String filename) {
-			};//FilenameFilter filter = new FilenameFilter() {
+				}
+			};
 
 			String[] fList = path.list(filter);
 			this.directoryShownIsEmpty = false;
 			for (int i = 0; i < fList.length; i++) {
-				
+
 				// Convert into file path
 				File sel = new File(path, fList[i]);
-				
-				Log.d(LOGTAG, "File:"+fList[i]+" readable:"+
-						(new Boolean(sel.canRead())).toString()
-						);
+
+				Log.d(LOGTAG, "File:" + fList[i] + " readable:"
+						+ (new Boolean(sel.canRead())).toString());
 				int drawableID = R.drawable.file_icon;
 				boolean canRead = sel.canRead();
 				// Set drawables
 				if (sel.isDirectory()) {
-					if(canRead) {
+					if (canRead) {
 						drawableID = R.drawable.folder_icon;
-					}
-					else { 
+					} else {
 						drawableID = R.drawable.folder_icon_light;
 					}
 				} else {
-					//Log.d("FILE", fileList[i].file);
-					//Log.d("FILE", fileList.get(i).file);
-					//Nothing to do here - file drawable is already added
-				}
-				
-				fileList.add(i, 
-						new Item(
-								fList[i], 
-								drawableID,
-								canRead));
-				
+				}// Nothing to do here - file drawable is already added
+				fileList.add(i, new Item(fList[i], drawableID, canRead));
+
 				Log.d("DIRECTORY", fileList.get(i).file);
-				Log.d(LOGTAG, "Drawable:"+ 
-						(new Integer(fileList.get(i).icon)).toString());
+				Log.d(LOGTAG,
+						"Drawable:"
+								+ (new Integer(fileList.get(i).icon))
+										.toString());
 			}
-			if(fileList.size()==0) {
+			if (fileList.size() == 0) {
 				Log.d(LOGTAG, "This directory is empty");
 				this.directoryShownIsEmpty = true;
-				fileList.add(0, 
-						new Item("Directory is empty", -1, true));
-			}
-			else {//sort non empty list
+				fileList.add(0, new Item("Directory is empty", -1, true));
+			} else {// sort non empty list
 				Collections.sort(fileList, new ItemFileNameComparator());
 			}
 		} else {
 			Log.e(LOGTAG, "path does not exist or cannot be read");
 		}
-		//Log.d(TAG, "loadFileList finished");
-	}//private void loadFileList() {
-	
-	private void createFileListAdapter(){
+	}
+
+	private void createFileListAdapter() {
 		adapter = new ArrayAdapter<Item>(this,
 				android.R.layout.select_dialog_item, android.R.id.text1,
-				fileList)
-			{
+				fileList) {
 			@Override
 			public View getView(int position, View convertView, ViewGroup parent) {
 				// creates view
-				//Log.d(TAG, "getView start");
+				// Log.d(TAG, "getView start");
 				View view = super.getView(position, convertView, parent);
 				TextView textView = (TextView) view
 						.findViewById(android.R.id.text1);
 
 				// put the image on the text view
 				int drawableID = 0;
-				if(fileList.get(position).icon != -1) {
-					//Log.d(TAG, "Putting image");
-					//If icon == -1, then directory is empty
+				if (fileList.get(position).icon != -1) {
+					// Log.d(TAG, "Putting image");
+					// If icon == -1, then directory is empty
 					drawableID = fileList.get(position).icon;
 				}
-				textView.setCompoundDrawablesWithIntrinsicBounds(
-						drawableID, 0, 0, 0);
-				
+				textView.setCompoundDrawablesWithIntrinsicBounds(drawableID, 0,
+						0, 0);
+
 				textView.setEllipsize(null);
 
 				// add margin between image and text (support various screen
 				// densities)
 				int dp5 = (int) (5 * getResources().getDisplayMetrics().density + 0.5f);
 				int dp3 = (int) (3 * getResources().getDisplayMetrics().density + 0.5f);
-				//TODO: change next line for empty directory, so text will be centered
+				// TODO: change next line for empty directory, so text will be
+				// centered
 				textView.setCompoundDrawablePadding(dp3);
 				textView.setBackgroundColor(Color.LTGRAY);
 				return view;
-			}//public View getView(int position, View convertView, ViewGroup parent) {
-		};//adapter = new ArrayAdapter<Item>(this,
-		//adapter.setNotifyOnChange(true);
-		
-		
-		
-	}//private createFileListAdapter(){
+			}
+		};
+
+	}
 
 	private class Item {
 		public String file;
@@ -434,14 +467,13 @@ public String toString() {
 			return file;
 		}
 	}
-	
+
 	private class ItemFileNameComparator implements Comparator<Item> {
 		public int compare(Item lhs, Item rhs) {
 			return lhs.file.toLowerCase().compareTo(rhs.file.toLowerCase());
 		}
-		
-	}//private class ItemComparator implements Comparator<Item> {
-	
+	}
+
 	public void onConfigurationChanged(Configuration newConfig) {
 		super.onConfigurationChanged(newConfig);
 
@@ -452,7 +484,7 @@ public void onConfigurationChanged(Configuration newConfig) {
 		}
 		// Layout apparently changes itself, only have to provide good onMeasure
 		// in custom components
-		//TODO: check with keyboard
+		// TODO: check with keyboard
 		// if(newConfig.keyboard == Configuration.KEYBOARDHIDDEN_YES)
 	}