diff --git a/README.md b/README.md
index 5bd0028d..7690dfc3 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # FlexibleAdapter
-#### Version of 2015.07.03
-#### A pattern for every RecycleView
+#### Version of 2015.07.20
+#### A pattern for every RecyclerView
 
-The functionalities are taken from different blogs (see at the bottom of the page), merged and methods have been improved for speed and scalability, for all Activities that use a RecycleView.
+The functionalities are taken from different Blogs (see at the bottom of the page), merged and methods have been improved for speed and scalability, for all Activities that use a RecycleView.
 
 * At lower class there is SelectableAdapter that provides selection functionalities and it's able to _maintain the state_ after the rotation, you just need to call the onSave/onRestore methods from the Activity!
 * Then, the class FlexibleAdapter handles the content paying attention at the animations (calling notify only for the position. _Note:_ you still need to set your animation to the RecyclerView when you create it in the Activity).
@@ -12,15 +12,15 @@ I've put the click listeners inside the ViewHolder and the Set is done at the cr
 
 Also note that this adapter handles the basic clicks: _single_ and _long clicks_. If you need a double tap you need to implement the android.view.GestureDetector.
 
-**Notes:**
-There's an example adapter which does not compile because you need to change the classes with the ones you have in your project :-)
-
 I still have to improve it, so keep an eye on it.
-I would like to add some new functionalities, like the Undo (Time is always missing).
+I would like to add some new functionalities, like the Undo.
+
+# Screenshots
+![Main screen](/screenshots/main_screen.png) ![Multi Selection](/screenshots/multi_selection.png)
 
 #Setup
 Ultra simple:
-No needs to create and import library for just 2 files, so just *copy* SelectableAdapter.java & FlexibleAdapter.java in your *common* package and start to *extend* FlexibleAdapter from your custom Adapter (see my example Adapter).
+No needs to create and import library for just 2 files, so just *copy* SelectableAdapter.java & FlexibleAdapter.java in your *common* package and start to *extend* FlexibleAdapter from your custom Adapter (see my ExampleAdapter).
 
 ####Pull requests / Issues / Improvement requests
 Feel free to do and ask!
@@ -42,8 +42,10 @@ In your activity change the Mode for the _ActionMode_ object.
 		mActionMode = null;
 	}
 
-
 #Change Log
+**2015.07.20**
+- New full working example Android Studio project! (with some nice extra-features)
+
 **2015.07.03**
 - Added new method _updateItem()_
 - Deprecated _removeSelection()_ -> Use _toggleSelection()_ instead!
@@ -62,7 +64,6 @@ In your activity change the Mode for the _ActionMode_ object.
 - Initial release
 
 #Thanks
-
 I've used these blogs as starting point:
 
 http://enoent.fr/blog/2015/01/18/recyclerview-basics/
diff --git a/flexibleAdapter/build.gradle b/flexibleAdapter/build.gradle
index 649b56df..0a1484b0 100644
--- a/flexibleAdapter/build.gradle
+++ b/flexibleAdapter/build.gradle
@@ -8,8 +8,8 @@ android {
 		applicationId "eu.davidea.flexibleadapter"
 		minSdkVersion 14
 		targetSdkVersion 22
-		versionCode 1
-		versionName "1.0"
+		versionCode 4
+		versionName "2015.07.20"
 	}
 	buildTypes {
 		release {
diff --git a/flexibleAdapter/src/main/AndroidManifest.xml b/flexibleAdapter/src/main/AndroidManifest.xml
index f1384bda..156a42a6 100644
--- a/flexibleAdapter/src/main/AndroidManifest.xml
+++ b/flexibleAdapter/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
 		android:label="@string/app_name"
 		android:theme="@style/AppTheme">
         <activity
-            android:name="eu.davidea.example.MainActivity">
+            android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/flexibleAdapter/src/main/ic_launcher-web.png b/flexibleAdapter/src/main/ic_launcher-web.png
index 363aa29d..becdf812 100644
Binary files a/flexibleAdapter/src/main/ic_launcher-web.png and b/flexibleAdapter/src/main/ic_launcher-web.png differ
diff --git a/flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/FlexibleAdapter.java b/flexibleAdapter/src/main/java/eu/davidea/common/FlexibleAdapter.java
similarity index 99%
rename from flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/FlexibleAdapter.java
rename to flexibleAdapter/src/main/java/eu/davidea/common/FlexibleAdapter.java
index 877cef01..0e4875c0 100644
--- a/flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/FlexibleAdapter.java
+++ b/flexibleAdapter/src/main/java/eu/davidea/common/FlexibleAdapter.java
@@ -1,4 +1,4 @@
-package eu.davidea.flexibleadapter;
+package eu.davidea.common;
 
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/SelectableAdapter.java b/flexibleAdapter/src/main/java/eu/davidea/common/SelectableAdapter.java
similarity index 99%
rename from flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/SelectableAdapter.java
rename to flexibleAdapter/src/main/java/eu/davidea/common/SelectableAdapter.java
index a8894fc6..a2677a0f 100644
--- a/flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/SelectableAdapter.java
+++ b/flexibleAdapter/src/main/java/eu/davidea/common/SelectableAdapter.java
@@ -1,4 +1,4 @@
-package eu.davidea.flexibleadapter;
+package eu.davidea.common;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/flexibleAdapter/src/main/java/eu/davidea/example/SimpleDividerItemDecoration.java b/flexibleAdapter/src/main/java/eu/davidea/common/SimpleDividerItemDecoration.java
similarity index 98%
rename from flexibleAdapter/src/main/java/eu/davidea/example/SimpleDividerItemDecoration.java
rename to flexibleAdapter/src/main/java/eu/davidea/common/SimpleDividerItemDecoration.java
index ad03b019..36b3915a 100644
--- a/flexibleAdapter/src/main/java/eu/davidea/example/SimpleDividerItemDecoration.java
+++ b/flexibleAdapter/src/main/java/eu/davidea/common/SimpleDividerItemDecoration.java
@@ -1,4 +1,4 @@
-package eu.davidea.example;
+package eu.davidea.common;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/flexibleAdapter/src/main/java/eu/davidea/common/SimpleTextWatcher.java b/flexibleAdapter/src/main/java/eu/davidea/common/SimpleTextWatcher.java
new file mode 100644
index 00000000..3f330672
--- /dev/null
+++ b/flexibleAdapter/src/main/java/eu/davidea/common/SimpleTextWatcher.java
@@ -0,0 +1,26 @@
+package eu.davidea.common;
+
+import android.text.Editable;
+import android.text.TextWatcher;
+
+/**
+ * {@link TextWatcher} implementation that does nothing by default
+ */
+public abstract class SimpleTextWatcher implements TextWatcher {
+	
+	@Override
+	public void onTextChanged(CharSequence s, int start, int before, int count) {
+		
+	}
+
+	@Override
+	public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+		
+	}
+	
+	@Override
+	public void afterTextChanged(Editable s) {
+		
+	}
+	
+}
\ No newline at end of file
diff --git a/flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/EditItemDialog.java b/flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/EditItemDialog.java
new file mode 100644
index 00000000..750b0fd5
--- /dev/null
+++ b/flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/EditItemDialog.java
@@ -0,0 +1,173 @@
+package eu.davidea.flexibleadapter;
+
+import android.annotation.SuppressLint;
+import android.app.DialogFragment;
+import android.app.Fragment;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.support.v7.app.AlertDialog;
+import android.text.Editable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.EditText;
+
+import eu.davidea.common.SimpleTextWatcher;
+import eu.davidea.utils.Utils;
+
+
+public class EditItemDialog extends DialogFragment {
+
+	public static final String TAG = EditItemDialog.class.getSimpleName();
+	public static final String ARG_ITEM = "item";
+	public static final String ARG_ITEM_POSITION = "position";
+
+	public interface OnEditItemListener {
+		void onTitleModified(int position, String newTitle);
+	}
+
+	private Item mItem;
+	private int mPosition;
+
+	public EditItemDialog() {
+	}
+
+	public static EditItemDialog newInstance(Item item, int position) {
+		return newInstance(item, position, null);
+	}
+
+	public static EditItemDialog newInstance(Item item, int position, Fragment fragment) {
+		EditItemDialog dialog = new EditItemDialog();
+		Bundle args = new Bundle();
+		args.putSerializable(ARG_ITEM, item);
+		args.putInt(ARG_ITEM_POSITION, position);
+		dialog.setArguments(args);
+		dialog.setArguments(args);
+		dialog.setTargetFragment(fragment, 0);
+		return dialog;
+	}
+
+	private OnEditItemListener getListener() {
+		OnEditItemListener listener = (OnEditItemListener) getTargetFragment();
+		if (listener == null) {
+			listener = (OnEditItemListener) getActivity();
+		}
+		return listener;
+	}
+
+	@Override
+	public void onSaveInstanceState(Bundle outState) {
+		outState.putSerializable(ARG_ITEM, mItem);
+		super.onSaveInstanceState(outState);
+	}
+
+	@Override
+	public void onStart() {
+		super.onStart();
+		getDialog().getWindow().setWindowAnimations(R.style.animation_slide_from_right);
+	}
+
+	@SuppressLint({"InflateParams", "HandlerLeak"})
+	@Override
+	public AlertDialog onCreateDialog(Bundle savedInstanceState) {
+		//Pick up bundle parameters
+		Bundle bundle;
+		if (savedInstanceState == null) {
+			bundle = getArguments();
+		} else {
+			bundle = savedInstanceState;
+		}
+
+		mItem = (Item) bundle.getSerializable(ARG_ITEM);
+		mPosition = bundle.getInt(ARG_ITEM_POSITION);
+
+		//Inflate custom view
+		View dialogView = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_edit_item, null);
+
+		final EditText editText = (EditText) dialogView.findViewById(R.id.text_edit_title);
+
+		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());//, R.style.AppTheme_AlertDialog);
+		builder.setTitle(R.string.dialog_edit_title)
+				.setView(dialogView)
+				.setNegativeButton(R.string.CANCEL, new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						Utils.hideSoftInputFrom(getActivity(), editText);
+						dialog.dismiss();
+					}
+				})
+				.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						getListener().onTitleModified(mPosition,
+								editText.getText().toString().trim());
+						Utils.hideSoftInputFrom(getActivity(), editText);
+						dialog.dismiss();
+					}
+				});
+
+		final AlertDialog editDialog = builder.create();
+
+		editDialog.setOnShowListener(new DialogInterface.OnShowListener() {
+			@Override
+			public void onShow(DialogInterface dialog) {
+				updateOkButtonState(editDialog, null);
+			}
+		});
+
+		if (mItem != null) {
+			editText.setText(mItem.getTitle());
+			editText.selectAll();
+		}
+		editText.requestFocus();
+		editText.addTextChangedListener(new SimpleTextWatcher() {
+			private final static long DELAY = 400L;
+			private final static int TRIGGER = 1;
+
+			private Handler mHandler = new Handler() {
+				@Override
+				public void handleMessage(Message msg) {
+					if (msg.what == TRIGGER) {
+						updateOkButtonState(editDialog, editText);
+					}
+				}
+			};
+
+			@Override
+			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+				updateOkButtonState(editDialog, null);
+			}
+
+			@Override
+			public void afterTextChanged(Editable s) {
+				mHandler.removeMessages(TRIGGER);
+				mHandler.sendEmptyMessageDelayed(TRIGGER, DELAY);
+			}
+		});
+
+		editDialog.getWindow().setSoftInputMode(
+				WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+
+		return editDialog;
+	}
+
+	private void updateOkButtonState(AlertDialog dialog, EditText editText) {
+		Button buttonOK = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
+		if (editText == null || (editText.getText().toString().trim()).length() == 0) {
+			buttonOK.setEnabled(false);
+			return;
+		}
+		if (mItem != null && !mItem.getTitle().equalsIgnoreCase(editText.getText().toString().trim())) {
+			buttonOK.setEnabled(true);
+		} else {
+			editText.setError(getActivity().getString(R.string.err_no_edit));
+			buttonOK.setEnabled(false);
+		}
+
+		return;
+	}
+
+}
\ No newline at end of file
diff --git a/flexibleAdapter/src/main/java/eu/davidea/example/ExampleAdapter.java b/flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/ExampleAdapter.java
similarity index 95%
rename from flexibleAdapter/src/main/java/eu/davidea/example/ExampleAdapter.java
rename to flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/ExampleAdapter.java
index 76128ce4..e7fd37a6 100644
--- a/flexibleAdapter/src/main/java/eu/davidea/example/ExampleAdapter.java
+++ b/flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/ExampleAdapter.java
@@ -1,4 +1,4 @@
-package eu.davidea.example;
+package eu.davidea.flexibleadapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -13,8 +13,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import eu.davidea.flexibleadapter.FlexibleAdapter;
-import eu.davidea.flexibleadapter.R;
+import eu.davidea.common.FlexibleAdapter;
 
 
 public class ExampleAdapter extends FlexibleAdapter<ExampleAdapter.SimpleViewHolder, Item> {
@@ -157,13 +156,13 @@ public void run() {
 		} else {
 			//Display the current flip status
 			//setFlipped(holder.mImageView, isSelected(position));
+		}
 
-			//This "if-else" is just an example
-			if (isSelected(position)) {
-				holder.mImageView.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.image_round_selected));
-			} else {
-				holder.mImageView.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.image_round_normal));
-			}
+		//This "if-else" is just an example
+		if (isSelected(position)) {
+			holder.mImageView.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.image_round_selected));
+		} else {
+			holder.mImageView.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.image_round_normal));
 		}
 
 		holder.mTitle.setText(item.getTitle());
diff --git a/flexibleAdapter/src/main/java/eu/davidea/example/Item.java b/flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/Item.java
similarity index 76%
rename from flexibleAdapter/src/main/java/eu/davidea/example/Item.java
rename to flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/Item.java
index f6849759..97d0b127 100644
--- a/flexibleAdapter/src/main/java/eu/davidea/example/Item.java
+++ b/flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/Item.java
@@ -1,6 +1,11 @@
-package eu.davidea.example;
+package eu.davidea.flexibleadapter;
+
+import java.io.Serializable;
+
+public class Item implements Serializable {
+
+	private static final long serialVersionUID = -6882745111884490060L;
 
-public class Item {
 	private int id;
 	private String title;
 	private String subtitle;
diff --git a/flexibleAdapter/src/main/java/eu/davidea/example/MainActivity.java b/flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/MainActivity.java
similarity index 88%
rename from flexibleAdapter/src/main/java/eu/davidea/example/MainActivity.java
rename to flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/MainActivity.java
index 0ce0e016..414c7c64 100644
--- a/flexibleAdapter/src/main/java/eu/davidea/example/MainActivity.java
+++ b/flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/MainActivity.java
@@ -1,4 +1,4 @@
-package eu.davidea.example;
+package eu.davidea.flexibleadapter;
 
 import android.annotation.TargetApi;
 import android.os.Build;
@@ -14,14 +14,15 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.AdapterView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import eu.davidea.flexibleadapter.R;
+import eu.davidea.common.SimpleDividerItemDecoration;
 import eu.davidea.utils.Utils;
 
 public class MainActivity extends AppCompatActivity implements
-		ActionMode.Callback,
+		ActionMode.Callback, EditItemDialog.OnEditItemListener,
 		ExampleAdapter.OnItemClickListener {
 
 	public static final String TAG = MainActivity.class.getSimpleName();
@@ -71,21 +72,26 @@ protected void onCreate(Bundle savedInstanceState) {
 		mFab.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
+				destroyActionModeIfNeeded();
+
 				Item item = null;
 				for (int i = 0; i<mAdapter.getItemCount()+1; i++) {
 					item = mAdapter.getNewExampleItem(i);
-					Log.d(TAG, "check "+item.getId());
 					if (!mAdapter.contains(item)) {
 						mAdapter.addItem(i, item);
 						Toast.makeText(MainActivity.this, "Added New "+item.getTitle(), Toast.LENGTH_SHORT).show();
 						mRecyclerView.smoothScrollToPosition(i);
+
+						//EmptyView
+						updateEmptyView();
+
 						break;
 					}
 				}
 			}
 		});
 
-		//EmptyView
+		//Update EmptyView (by default EmptyView is visible)
 		updateEmptyView();
 
 		//Restore previous state
@@ -107,7 +113,12 @@ public void onClick(View v) {
 	public void onSaveInstanceState(Bundle outState) {
 		Log.v(TAG, "onSaveInstanceState start!");
 
-		mAdapter.onSaveInstanceState(outState);
+		if (mActivatedPosition != AdapterView.INVALID_POSITION) {
+			//Serialize and persist the activated item position.
+			outState.putInt(STATE_ACTIVATED_POSITION, mActivatedPosition);
+			Log.d(TAG, STATE_ACTIVATED_POSITION + "=" + mActivatedPosition);
+		}
+		super.onSaveInstanceState(outState);
 	}
 
 	@Override
@@ -121,7 +132,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
 		int id = item.getItemId();
 		//noinspection SimplifiableIfStatement
 		if (id == R.id.action_about) {
-			Toast.makeText(this, "Not yet implemented", Toast.LENGTH_SHORT).show();
+			MessageDialog.newInstance(
+					R.drawable.ic_info_grey600_24dp,
+					getString(R.string.about_title),
+					getString(R.string.about_body, Utils.getVersionName(this)) )
+					.show(getFragmentManager(), MessageDialog.TAG);
 			return true;
 		}
 
@@ -161,6 +176,14 @@ private void setActivatedPosition(int position) {
 		mActivatedPosition = position;
 	}
 
+
+	@Override
+	public void onTitleModified(int position, String newTitle) {
+		Item item = mAdapter.getItem(position);
+		item.setTitle(newTitle);
+		mAdapter.updateItem(position, item);
+	}
+
 	@Override
 	public boolean onListItemClick(int position) {
 		if (mActionMode != null && position != INVALID_POSITION) {
@@ -173,7 +196,7 @@ public boolean onListItemClick(int position) {
 				if (position != mActivatedPosition) setActivatedPosition(position);
 				Item item = mAdapter.getItem(position);
 				//TODO: call your custom Callback, for example mCallback.onItemSelected(item.getId());
-				Toast.makeText(this, "Click on "+item.getTitle(), Toast.LENGTH_SHORT).show();
+				EditItemDialog.newInstance(item, position).show(getFragmentManager(), EditItemDialog.TAG);
 			}
 			return false;
 		}
diff --git a/flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/MessageDialog.java b/flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/MessageDialog.java
new file mode 100644
index 00000000..37cadb96
--- /dev/null
+++ b/flexibleAdapter/src/main/java/eu/davidea/flexibleadapter/MessageDialog.java
@@ -0,0 +1,76 @@
+package eu.davidea.flexibleadapter;
+
+import android.annotation.SuppressLint;
+import android.app.DialogFragment;
+import android.app.Fragment;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.content.DialogInterface.OnShowListener;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import eu.davidea.utils.Utils;
+
+public class MessageDialog extends DialogFragment {
+	
+	public static final String TAG = MessageDialog.class.getSimpleName();
+	public static final String ARG_ICON = "icon";
+	public static final String ARG_TITLE = "title";
+	public static final String ARG_MESSAGE = "message";
+
+	public MessageDialog() {}
+	
+	public static MessageDialog newInstance(int icon, String title, String message) {
+		return newInstance(icon, title, message, null);
+	}
+	
+	public static MessageDialog newInstance(int icon, String title, String message, Fragment fragment) {
+		MessageDialog confirmDialog = new MessageDialog();
+		Bundle args = new Bundle();
+		args.putInt(ARG_ICON, icon);
+		args.putString(ARG_TITLE, title);
+		args.putString(ARG_MESSAGE, message);
+		confirmDialog.setArguments(args);
+		if (fragment != null) confirmDialog.setTargetFragment(fragment, 0);
+		return confirmDialog;
+	}
+	
+	@SuppressLint("InflateParams")
+	@Override
+	public AlertDialog onCreateDialog(Bundle savedInstanceState) {
+		View dialogView = LayoutInflater.from(getActivity())
+				.inflate(R.layout.dialog_message, null);
+		
+		TextView messageView = (TextView) dialogView.findViewById(R.id.message);
+		messageView.setMovementMethod(LinkMovementMethod.getInstance());
+		messageView.setText(Html.fromHtml(getArguments().getString(ARG_MESSAGE)));
+		
+		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());//), R.style.AppTheme_AlertDialog);
+		builder.setTitle(getArguments().getString(ARG_TITLE))
+				//.setIconAttribute(android.R.attr.alertDialogIcon)
+				.setIcon(getArguments().getInt(ARG_ICON))
+				.setView(dialogView)
+				.setPositiveButton(R.string.OK, new OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						dialog.dismiss();
+					}
+				});
+		
+		final AlertDialog dialog = builder.create();
+		dialog.setOnShowListener(new OnShowListener() {
+			@Override
+			public void onShow(DialogInterface dialog) {
+				Utils.hideSoftInput(getActivity());
+			}
+		});
+		
+		return dialog;
+	}
+	
+}
\ No newline at end of file
diff --git a/flexibleAdapter/src/main/java/eu/davidea/utils/Utils.java b/flexibleAdapter/src/main/java/eu/davidea/utils/Utils.java
index 81bddba6..64416b63 100644
--- a/flexibleAdapter/src/main/java/eu/davidea/utils/Utils.java
+++ b/flexibleAdapter/src/main/java/eu/davidea/utils/Utils.java
@@ -3,11 +3,16 @@
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.TargetApi;
+import android.app.Activity;
+import android.app.Application;
 import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
 import android.view.View;
 import android.view.ViewAnimationUtils;
+import android.view.inputmethod.InputMethodManager;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -75,6 +80,72 @@ public static boolean hasLollipop() {
 		return Build.VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP;
 	}
 
+	public static String getVersionName(Context context) {
+		try {
+			PackageInfo pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+			return "v"+pInfo.versionName;
+		} catch (PackageManager.NameNotFoundException e) {
+			return context.getString(android.R.string.unknownName);
+		}
+	}
+
+	public static int getVersionCode(Context context) {
+		try {
+			PackageInfo pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+			return pInfo.versionCode;
+		} catch (PackageManager.NameNotFoundException e) {
+			return 0;
+		}
+	}
+
+	/**
+	 * Show Soft Keyboard with new Thread
+	 * @param activity
+	 */
+	public static void hideSoftInput(final Activity activity) {
+		if (activity.getCurrentFocus() != null) {
+			new Runnable() {
+				public void run() {
+					InputMethodManager imm =
+							(InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+					imm.hideSoftInputFromWindow(activity.getCurrentFocus().getWindowToken(), 0);
+				}
+			}.run();
+		}
+	}
+
+	/**
+	 * Hide Soft Keyboard from Dialogs with new Thread
+	 * @param context
+	 * @param view
+	 */
+	public static void hideSoftInputFrom(final Context context, final View view) {
+		new Runnable() {
+			@Override
+			public void run() {
+				InputMethodManager imm =
+						(InputMethodManager) context.getSystemService(Activity.INPUT_METHOD_SERVICE);
+				imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+			}
+		}.run();
+	}
+
+	/**
+	 * Show Soft Keyboard with new Thread
+	 * @param context
+	 * @param view
+	 */
+	public static void showSoftInput(final Context context, final View view) {
+		new Runnable() {
+			@Override
+			public void run() {
+				InputMethodManager imm =
+						(InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+				imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
+			}
+		}.run();
+	}
+
 	/**
 	 * Create the reveal effect animation
 	 * @param view the View to reveal
diff --git a/flexibleAdapter/src/main/res/anim/fab_slide_in_from_left.xml b/flexibleAdapter/src/main/res/anim/fab_slide_in_from_left.xml
new file mode 100644
index 00000000..de953c70
--- /dev/null
+++ b/flexibleAdapter/src/main/res/anim/fab_slide_in_from_left.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:interpolator/overshoot">
+    <translate
+        android:fromXDelta="-100%p"
+        android:toXDelta="0"
+        android:duration="400" />
+</set>
\ No newline at end of file
diff --git a/flexibleAdapter/src/main/res/anim/fab_slide_in_from_right.xml b/flexibleAdapter/src/main/res/anim/fab_slide_in_from_right.xml
new file mode 100644
index 00000000..05c271f4
--- /dev/null
+++ b/flexibleAdapter/src/main/res/anim/fab_slide_in_from_right.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:interpolator/overshoot">
+    <translate
+        android:fromXDelta="100%p"
+        android:toXDelta="0"
+        android:duration="400" />
+</set>
\ No newline at end of file
diff --git a/flexibleAdapter/src/main/res/anim/fab_slide_out_to_left.xml b/flexibleAdapter/src/main/res/anim/fab_slide_out_to_left.xml
new file mode 100644
index 00000000..33f60b48
--- /dev/null
+++ b/flexibleAdapter/src/main/res/anim/fab_slide_out_to_left.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:interpolator/anticipate_overshoot">
+    <translate
+        android:fromXDelta="0"
+        android:toXDelta="-100%p"
+        android:duration="400" />
+</set>
\ No newline at end of file
diff --git a/flexibleAdapter/src/main/res/anim/fab_slide_out_to_right.xml b/flexibleAdapter/src/main/res/anim/fab_slide_out_to_right.xml
new file mode 100644
index 00000000..78c0d614
--- /dev/null
+++ b/flexibleAdapter/src/main/res/anim/fab_slide_out_to_right.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:interpolator/anticipate_overshoot">
+    <translate
+        android:fromXDelta="0"
+        android:toXDelta="100%p"
+        android:duration="400" />
+</set>
\ No newline at end of file
diff --git a/flexibleAdapter/src/main/res/drawable-hdpi/ic_info_grey600_24dp.png b/flexibleAdapter/src/main/res/drawable-hdpi/ic_info_grey600_24dp.png
new file mode 100644
index 00000000..713a9ba9
Binary files /dev/null and b/flexibleAdapter/src/main/res/drawable-hdpi/ic_info_grey600_24dp.png differ
diff --git a/flexibleAdapter/src/main/res/drawable-mdpi/ic_expand_more_grey600_24dp.png b/flexibleAdapter/src/main/res/drawable-mdpi/ic_expand_more_grey600_24dp.png
new file mode 100644
index 00000000..c6d6c962
Binary files /dev/null and b/flexibleAdapter/src/main/res/drawable-mdpi/ic_expand_more_grey600_24dp.png differ
diff --git a/flexibleAdapter/src/main/res/drawable-mdpi/ic_info_grey600_24dp.png b/flexibleAdapter/src/main/res/drawable-mdpi/ic_info_grey600_24dp.png
new file mode 100644
index 00000000..2537c5f4
Binary files /dev/null and b/flexibleAdapter/src/main/res/drawable-mdpi/ic_info_grey600_24dp.png differ
diff --git a/flexibleAdapter/src/main/res/drawable-v21/button_mini_oval.xml b/flexibleAdapter/src/main/res/drawable-v21/button_mini_oval.xml
index d88fe966..9d7fdd75 100644
--- a/flexibleAdapter/src/main/res/drawable-v21/button_mini_oval.xml
+++ b/flexibleAdapter/src/main/res/drawable-v21/button_mini_oval.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
     android:exitFadeDuration="@android:integer/config_shortAnimTime"
-    android:color="?android:colorControlHighlight">
+    android:color="@android:color/white">
     
     <selector>
 		<item>
diff --git a/flexibleAdapter/src/main/res/drawable-v21/selector_item_light.xml b/flexibleAdapter/src/main/res/drawable-v21/selector_item_light.xml
index bbe0b902..b84ac1ab 100644
--- a/flexibleAdapter/src/main/res/drawable-v21/selector_item_light.xml
+++ b/flexibleAdapter/src/main/res/drawable-v21/selector_item_light.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:exitFadeDuration="@android:integer/config_shortAnimTime"
-    android:color="?android:attr/colorControlHighlight">
-	
+		android:exitFadeDuration="@android:integer/config_shortAnimTime"
+		android:color="?android:attr/colorControlHighlight">
+
 	<item android:id="@android:id/mask"
-		android:drawable="@color/list_choice_pressed_bg_light" />
-	
+		  android:drawable="@color/list_choice_pressed_bg_light" />
+	<item>
+		<selector>
+			<item android:state_activated="true" android:drawable="@color/list_choice_pressed_bg_light"/>
+		</selector>
+	</item>
+
 </ripple>
\ No newline at end of file
diff --git a/flexibleAdapter/src/main/res/drawable-xhdpi/ic_info_grey600_24dp.png b/flexibleAdapter/src/main/res/drawable-xhdpi/ic_info_grey600_24dp.png
new file mode 100644
index 00000000..9dcb234f
Binary files /dev/null and b/flexibleAdapter/src/main/res/drawable-xhdpi/ic_info_grey600_24dp.png differ
diff --git a/flexibleAdapter/src/main/res/drawable-xxhdpi/ic_info_grey600_24dp.png b/flexibleAdapter/src/main/res/drawable-xxhdpi/ic_info_grey600_24dp.png
new file mode 100644
index 00000000..64445284
Binary files /dev/null and b/flexibleAdapter/src/main/res/drawable-xxhdpi/ic_info_grey600_24dp.png differ
diff --git a/flexibleAdapter/src/main/res/drawable-xxxhdpi/ic_info_grey600_24dp.png b/flexibleAdapter/src/main/res/drawable-xxxhdpi/ic_info_grey600_24dp.png
new file mode 100644
index 00000000..17abca45
Binary files /dev/null and b/flexibleAdapter/src/main/res/drawable-xxxhdpi/ic_info_grey600_24dp.png differ
diff --git a/flexibleAdapter/src/main/res/drawable-xhdpi/button_mini_oval.xml b/flexibleAdapter/src/main/res/drawable/button_mini_oval.xml
similarity index 100%
rename from flexibleAdapter/src/main/res/drawable-xhdpi/button_mini_oval.xml
rename to flexibleAdapter/src/main/res/drawable/button_mini_oval.xml
diff --git a/flexibleAdapter/src/main/res/layout/activity_main.xml b/flexibleAdapter/src/main/res/layout/activity_main.xml
index 9aea233a..3d7d6d30 100644
--- a/flexibleAdapter/src/main/res/layout/activity_main.xml
+++ b/flexibleAdapter/src/main/res/layout/activity_main.xml
@@ -3,7 +3,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	tools:context="eu.davidea.example.MainActivity">
+	tools:context="eu.davidea.flexibleadapter.example.MainActivity">
 
 	<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
 		android:id="@+id/recycler_view"
diff --git a/flexibleAdapter/src/main/res/layout/dialog_edit_item.xml b/flexibleAdapter/src/main/res/layout/dialog_edit_item.xml
new file mode 100644
index 00000000..3f0b0ac9
--- /dev/null
+++ b/flexibleAdapter/src/main/res/layout/dialog_edit_item.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	style="@style/AppTheme.DialogMetrics">
+
+	<android.support.design.widget.TextInputLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<EditText
+			android:id="@+id/text_edit_title"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:scrollHorizontally="true"
+			android:maxLines="1"
+			android:inputType="text|textCapSentences"
+			android:imeOptions="actionDone|flagNoFullscreen"
+			android:hint="@string/dialog_edit_title_hint"/>
+
+	</android.support.design.widget.TextInputLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/flexibleAdapter/src/main/res/layout/dialog_message.xml b/flexibleAdapter/src/main/res/layout/dialog_message.xml
new file mode 100644
index 00000000..b794b8d9
--- /dev/null
+++ b/flexibleAdapter/src/main/res/layout/dialog_message.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:scrollbars="vertical"
+	android:scrollbarStyle="outsideInset">
+		
+	<TextView 
+	   	android:id="@+id/message"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:paddingTop="@dimen/dialog_padding_vertical"
+		android:layout_marginLeft="@dimen/dialog_padding_horizontal"
+		android:layout_marginStart="@dimen/dialog_padding_horizontal"
+		android:layout_marginRight="@dimen/dialog_padding_horizontal"
+		android:layout_marginEnd="@dimen/dialog_padding_horizontal"
+		android:paddingBottom="@dimen/dialog_padding_vertical"
+		tools:text="Message"/>
+
+</ScrollView>
\ No newline at end of file
diff --git a/flexibleAdapter/src/main/res/layout/recycler_uls_row.xml b/flexibleAdapter/src/main/res/layout/recycler_uls_row.xml
index 7cba0f8c..3bd732df 100644
--- a/flexibleAdapter/src/main/res/layout/recycler_uls_row.xml
+++ b/flexibleAdapter/src/main/res/layout/recycler_uls_row.xml
@@ -30,8 +30,8 @@
 		android:layout_alignParentRight="true"
 		android:layout_alignParentEnd="true"
 		android:layout_centerInParent="true"
-		android:layout_marginRight="@dimen/margin_right"
-		android:layout_marginEnd="@dimen/margin_right">
+		android:layout_marginRight="@dimen/margin_right_small"
+		android:layout_marginEnd="@dimen/margin_right_small">
 
 		<ImageView
 			android:id="@+id/dismiss_icon"
diff --git a/flexibleAdapter/src/main/res/menu/menu_main.xml b/flexibleAdapter/src/main/res/menu/menu_main.xml
index 67a5163d..a0addfce 100644
--- a/flexibleAdapter/src/main/res/menu/menu_main.xml
+++ b/flexibleAdapter/src/main/res/menu/menu_main.xml
@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 	  xmlns:tools="http://schemas.android.com/tools"
 	  xmlns:app="http://schemas.android.com/apk/res-auto"
-	  tools:context="eu.davidea.example.MainActivity">
+	  tools:context="eu.davidea.flexibleadapter.example.MainActivity">
 
 	<item android:id="@+id/action_about"
 		  android:title="@string/action_about"
diff --git a/flexibleAdapter/src/main/res/mipmap-hdpi/ic_launcher.png b/flexibleAdapter/src/main/res/mipmap-hdpi/ic_launcher.png
index bdb29e1e..88a339a2 100644
Binary files a/flexibleAdapter/src/main/res/mipmap-hdpi/ic_launcher.png and b/flexibleAdapter/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/flexibleAdapter/src/main/res/mipmap-mdpi/ic_launcher.png b/flexibleAdapter/src/main/res/mipmap-mdpi/ic_launcher.png
index c291c475..c8bc1d34 100644
Binary files a/flexibleAdapter/src/main/res/mipmap-mdpi/ic_launcher.png and b/flexibleAdapter/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/flexibleAdapter/src/main/res/mipmap-xhdpi/ic_launcher.png b/flexibleAdapter/src/main/res/mipmap-xhdpi/ic_launcher.png
index 205062f9..03b48293 100644
Binary files a/flexibleAdapter/src/main/res/mipmap-xhdpi/ic_launcher.png and b/flexibleAdapter/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/flexibleAdapter/src/main/res/mipmap-xxhdpi/ic_launcher.png b/flexibleAdapter/src/main/res/mipmap-xxhdpi/ic_launcher.png
index c2505b3c..30aab9ae 100644
Binary files a/flexibleAdapter/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/flexibleAdapter/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/flexibleAdapter/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/flexibleAdapter/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 57ea3b4f..a0ff0d29 100644
Binary files a/flexibleAdapter/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/flexibleAdapter/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/flexibleAdapter/src/main/res/values/dimens.xml b/flexibleAdapter/src/main/res/values/dimens.xml
index f06e14af..42ffdd4f 100644
--- a/flexibleAdapter/src/main/res/values/dimens.xml
+++ b/flexibleAdapter/src/main/res/values/dimens.xml
@@ -6,8 +6,12 @@
 	<dimen name="margin_bottom">16dp</dimen>
 	<dimen name="margin_left">16dp</dimen>
 	<dimen name="margin_right">16dp</dimen>
+	<dimen name="margin_right_small">8dp</dimen>
 	<dimen name="icon_width">40dp</dimen>
 	<dimen name="icon_height">40dp</dimen>
-	<dimen name="icon_touchable_component_mini">32dp</dimen>
+	<dimen name="icon_touchable_component_mini">40dp</dimen>
 	<dimen name="fab_margin">16dp</dimen>
+
+	<dimen name="dialog_padding_vertical">24dp</dimen>
+	<dimen name="dialog_padding_horizontal">24dp</dimen>
 </resources>
diff --git a/flexibleAdapter/src/main/res/values/strings.xml b/flexibleAdapter/src/main/res/values/strings.xml
index 652eaa29..529cf155 100644
--- a/flexibleAdapter/src/main/res/values/strings.xml
+++ b/flexibleAdapter/src/main/res/values/strings.xml
@@ -8,7 +8,40 @@
 	<string name="action_deleted">deleted</string>
 
 	<!-- User Learns Selection -->
-	<string name="uls_title"><![CDATA[<i>Click on Image [or LongClick on Item] to select that Item</i>]]></string>
-	<string name="uls_subtitle"><![CDATA[<i>This is an example of 2nd view</i>]]></string>
+	<string name="uls_title"><![CDATA[<i>Click on Image (or LongClick on Item) to select that Item</i>]]></string>
+	<string name="uls_subtitle"><![CDATA[<i>This is an example of 2nd view type</i>]]></string>
 	<string name="no_items">No items</string>
-</resources>
+	<string name="dialog_edit_title_hint">Title</string>
+	<string name="dialog_edit_title">Edit title</string>
+	<string name="CANCEL">Cancel</string>
+	<string name="OK">OK</string>
+	<string name="err_no_edit">Nothing to modify</string>
+
+	<!-- About -->
+	<string name="about_title">About</string>
+	<string name="about_body"><![CDATA[
+<b>Flexible Adapter</b><br/>
+%1$s
+
+<br/><br/><b>Author</b><br/>
+<a href="https://plus.google.com/u/0/108655371836503419479">Davide Steduto on G+</a>
+
+<br/><br/><b>Contact</b><br/>
+<a href="https://github.com/davideas">Github Profile</a>
+
+<br/><br/><b>Licence</b><br/>
+Copyright © 2015 Davide Steduto.
+<br/><br/>Licensed under the Apache License, Version 2.0 (the "License");
+You may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+<br/><br/><a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>
+
+<br/><br/>Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+<br/>See the License for the specific language governing permissions and
+limitations under the License.
+]]></string>
+
+</resources>
\ No newline at end of file
diff --git a/flexibleAdapter/src/main/res/values/styles.xml b/flexibleAdapter/src/main/res/values/styles.xml
index 13ea8134..04a3577a 100644
--- a/flexibleAdapter/src/main/res/values/styles.xml
+++ b/flexibleAdapter/src/main/res/values/styles.xml
@@ -17,4 +17,17 @@
 		<item name="primaryTextSelector">@drawable/primary_text_selector_light</item>
     </style>
 
+	<style name="animation_slide_from_right">
+		<item name="android:windowEnterAnimation">@anim/fab_slide_in_from_right</item>
+		<item name="android:windowExitAnimation">@anim/fab_slide_out_to_left</item>
+	</style>
+
+    <style name="AppTheme.DialogMetrics">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingLeft">@dimen/dialog_padding_horizontal</item>
+        <item name="android:paddingRight">@dimen/dialog_padding_horizontal</item>
+        <item name="android:paddingTop">@dimen/dialog_padding_vertical</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..8c0fb64a
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..02c998cf
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Jul 20 18:19:31 CEST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
diff --git a/screenshots/main_screen.png b/screenshots/main_screen.png
new file mode 100644
index 00000000..90beb02b
Binary files /dev/null and b/screenshots/main_screen.png differ
diff --git a/screenshots/multi_selection.png b/screenshots/multi_selection.png
new file mode 100644
index 00000000..05da67b6
Binary files /dev/null and b/screenshots/multi_selection.png differ