diff --git a/Material.iml b/Material.iml
index c5b5ba00..d0f29e8a 100644
--- a/Material.iml
+++ b/Material.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="Material" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.github.rey5137" external.system.module.version="1.1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="Material" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.github.rey5137" external.system.module.version="1.1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
diff --git a/app/app.iml b/app/app.iml
index 9f4d0375..4b91df35 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.rey5137" external.system.module.version="1.1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.rey5137" external.system.module.version="1.1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0a5bdae6..b6131f28 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,8 @@
         android:allowBackup="true"
         android:label="@string/app_name"
         android:icon="@drawable/ic_launcher"
-        android:theme="@style/Theme.AppTheme">
+        android:theme="@style/Theme.AppTheme"
+        android:supportsRtl="true">
 
         <activity
             android:name=".MainActivity"
diff --git a/app/src/main/assets/FreeSans.ttf b/app/src/main/assets/FreeSans.ttf
new file mode 100644
index 00000000..9db95853
Binary files /dev/null and b/app/src/main/assets/FreeSans.ttf differ
diff --git a/app/src/main/java/com/rey/material/app/ContactView.java b/app/src/main/java/com/rey/material/app/ContactView.java
index e2920ad8..68d39d70 100644
--- a/app/src/main/java/com/rey/material/app/ContactView.java
+++ b/app/src/main/java/com/rey/material/app/ContactView.java
@@ -30,6 +30,7 @@
 import com.rey.material.demo.R;
 import com.rey.material.drawable.BlankDrawable;
 import com.rey.material.util.ThemeUtil;
+import com.rey.material.util.ViewUtil;
 import com.rey.material.widget.ImageButton;
 import com.rey.material.widget.RippleManager;
 import com.squareup.picasso.Picasso;
@@ -126,10 +127,7 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr, int def
             int resId = a.getResourceId(R.styleable.ContactView_cv_buttonSrc, 0);
             if(resId != 0)
                 mButton.setImageResource(resId);
-            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
-                mButton.setBackground(BlankDrawable.getInstance());
-            else
-                mButton.setBackgroundDrawable(BlankDrawable.getInstance());
+            ViewUtil.setBackground(mButton, BlankDrawable.getInstance());
             mButton.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
             mButton.setFocusableInTouchMode(false);
             mButton.setFocusable(false);
diff --git a/app/src/main/java/com/rey/material/app/RecurringPickerDialog.java b/app/src/main/java/com/rey/material/app/RecurringPickerDialog.java
index db38c179..7138bb29 100644
--- a/app/src/main/java/com/rey/material/app/RecurringPickerDialog.java
+++ b/app/src/main/java/com/rey/material/app/RecurringPickerDialog.java
@@ -13,6 +13,7 @@
 import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.v4.view.ViewCompat;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -33,6 +34,7 @@
 
 import com.rey.material.demo.R;
 import com.rey.material.util.ThemeUtil;
+import com.rey.material.util.ViewUtil;
 import com.rey.material.widget.CompoundButton;
 import com.rey.material.widget.EditText;
 import com.rey.material.widget.RadioButton;
@@ -110,12 +112,9 @@ public void onGlobalLayout() {
 
         mHeaderBackground = new HeaderDrawable(getContext());
 
-        fl_mode.setPadding(mContentPadding, 0, mContentPadding, 0);
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
-            fl_mode.setBackground(mHeaderBackground);
-        else
-            fl_mode.setBackgroundDrawable(mHeaderBackground);
-        ll_repeat.setPadding(mContentPadding, mActionOuterPadding, mContentPadding, mActionPadding);
+        ViewCompat.setPaddingRelative(fl_mode, mContentPadding, 0, mContentPadding, 0);
+        ViewUtil.setBackground(fl_mode, mHeaderBackground);
+        ViewCompat.setPaddingRelative(ll_repeat, mContentPadding, mActionOuterPadding, mContentPadding, mActionPadding);
 
         mModeAdapter = new ModeAdapter();
         mModeSpinner.setAdapter(mModeAdapter);
@@ -415,7 +414,6 @@ private void onModeSelected(int mode){
     }
 
     private void onEndSelected(int endMode){
-        int oldEndMode = mRecurring.getEndMode();
         mRecurring.setEndMode(endMode);
         mRecurring.setEndSetting(0);
 
diff --git a/app/src/main/java/com/rey/material/app/WeekView.java b/app/src/main/java/com/rey/material/app/WeekView.java
index 0f1c7549..17d185d8 100644
--- a/app/src/main/java/com/rey/material/app/WeekView.java
+++ b/app/src/main/java/com/rey/material/app/WeekView.java
@@ -5,6 +5,7 @@
 import android.content.res.Configuration;
 import android.content.res.TypedArray;
 import android.graphics.Paint;
+import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.annotation.NonNull;
@@ -108,34 +109,36 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr, int def
             mBackgroundColors = new ColorStateList(states, colors);
         }
 
-        Calendar cal = Calendar.getInstance();
-        mFirstDayOfWeek = cal.getFirstDayOfWeek();
-        int color = mBackgroundColors.getColorForState(getDrawableState(), mBackgroundColors.getDefaultColor());
-
-        for(int i = 0; i < 7; i++){
-            int dayOFWeek = mFirstDayOfWeek + i;
-            if(dayOFWeek > Calendar.SATURDAY)
-                dayOFWeek = Calendar.SUNDAY;
-            cal.set(Calendar.DAY_OF_WEEK, dayOFWeek);
-
-            CircleCheckedTextView view = new CircleCheckedTextView(context, attrs, defStyleAttr, defStyleRes);
-            view.setText(cal.getDisplayName(Calendar.DAY_OF_WEEK, Calendar.SHORT, Locale.getDefault()).toUpperCase());
-            view.setTag(dayOFWeek);
-            view.setOnCheckedChangeListener(mCheckListener);
-            view.setOnClickListener(mClickListener);
-            view.setCheckedImmediately(false);
-            view.setPadding(0, 0, 0, 0);
-            view.setBackgroundColor(color);
-            view.setAnimDuration(animDuration);
-            view.setId(ViewUtil.generateViewId());
-
-            if(i == 0) {
-                mOriginalTextSize = view.getTextSize();
-                mPaint.setTypeface(view.getTypeface());
-            }
-
-            addView(view);
-        }
+//        Calendar cal = Calendar.getInstance();
+//        mFirstDayOfWeek = cal.getFirstDayOfWeek();
+//        int color = mBackgroundColors.getColorForState(getDrawableState(), mBackgroundColors.getDefaultColor());
+//
+//        for(int i = 0; i < 7; i++){
+//            int dayOFWeek = mFirstDayOfWeek + i;
+//            if(dayOFWeek > Calendar.SATURDAY)
+//                dayOFWeek -= Calendar.SATURDAY;
+//            cal.set(Calendar.DAY_OF_WEEK, dayOFWeek);
+//
+//            CircleCheckedTextView view = new CircleCheckedTextView(context, attrs, defStyleAttr, defStyleRes);
+//            view.setText(cal.getDisplayName(Calendar.DAY_OF_WEEK, Calendar.SHORT, Locale.getDefault()).toUpperCase());
+//            view.setTag(dayOFWeek);
+//            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
+//                view.setTextAlignment(TEXT_ALIGNMENT_CENTER);
+//            view.setOnCheckedChangeListener(mCheckListener);
+//            view.setOnClickListener(mClickListener);
+//            view.setCheckedImmediately(false);
+//            view.setPadding(0, 0, 0, 0);
+//            view.setBackgroundColor(color);
+//            view.setAnimDuration(animDuration);
+//            view.setId(ViewUtil.generateViewId());
+//
+//            if(i == 0) {
+//                mOriginalTextSize = view.getTextSize();
+//                mPaint.setTypeface(view.getTypeface());
+//            }
+//
+//            addView(view);
+//        }
     }
 
     @Override
diff --git a/app/src/main/java/com/rey/material/demo/ButtonFragment.java b/app/src/main/java/com/rey/material/demo/ButtonFragment.java
index 490c7d03..31066367 100644
--- a/app/src/main/java/com/rey/material/demo/ButtonFragment.java
+++ b/app/src/main/java/com/rey/material/demo/ButtonFragment.java
@@ -14,6 +14,7 @@
 import com.rey.material.app.DialogFragment;
 import com.rey.material.app.Recurring;
 import com.rey.material.app.RecurringPickerDialog;
+import com.rey.material.drawable.RippleDrawable;
 import com.rey.material.widget.Button;
 import com.rey.material.widget.FloatingActionButton;
 
@@ -53,6 +54,8 @@ public void onClick(View v) {
                     FloatingActionButton bt = (FloatingActionButton)v;
                     bt.setLineMorphingState((bt.getLineMorphingState() + 1) % 2, true);
                 }
+
+                System.out.println(v + " " + ((RippleDrawable)v.getBackground()).getDelayClickType());
 			}
 		};
 		
@@ -64,6 +67,8 @@ public void onClick(View v) {
                     FloatingActionButton bt = (FloatingActionButton)v;
                     bt.setLineMorphingState((bt.getLineMorphingState() + 1) % 2, true);
                 }
+
+                System.out.println(v + " " + ((RippleDrawable)v.getBackground()).getDelayClickType());
 			}
 		};
 		
@@ -81,37 +86,37 @@ public void onClick(View v) {
 		bt_float_color.setOnClickListener(listener_delay);
 		bt_float_wave_color.setOnClickListener(listener_delay);
 
-//        bt_flat.setOnClickListener(new View.OnClickListener(){
-//            @Override
-//            public void onClick(View v) {
-//                RecurringPickerDialog.Builder builder = new RecurringPickerDialog.Builder(R.style.Material_App_Dialog_Light){
-//                    @Override
-//                    public void onPositiveActionClicked(DialogFragment fragment) {
-//                        RecurringPickerDialog dialog = (RecurringPickerDialog)fragment.getDialog();
-//                        Toast.makeText(fragment.getActivity(), dialog.getRecurring().toString(), Toast.LENGTH_LONG).show();
-//                        fragment.dismiss();
-//                    }
-//
-//                    @Override
-//                    public void onNegativeActionClicked(DialogFragment fragment) {
-//                        Toast.makeText(fragment.getActivity(), "Cancelled", Toast.LENGTH_SHORT).show();
-//                        fragment.dismiss();
-//                    }
-//                };
-//                Recurring recurring = new Recurring();
-//                recurring.setStartTime(System.currentTimeMillis());
-//                recurring.setRepeatMode(Recurring.REPEAT_WEEKLY);
-//                recurring.setEnabledWeekday(Calendar.SUNDAY, true);
-//                recurring.setEnabledWeekday(Calendar.TUESDAY, true);
-//                builder.recurring(recurring)
-//                        .datePickerLayoutStyle(R.style.Material_App_Dialog_DatePicker_Light)
-//                        .positiveAction("OK")
-//                        .negativeAction("CANCEL");
-//
-//                DialogFragment fragment = DialogFragment.newInstance(builder);
-//                fragment.show(getFragmentManager(), null);
-//            }
-//        });
+        bt_flat.setOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v) {
+                RecurringPickerDialog.Builder builder = new RecurringPickerDialog.Builder(R.style.Material_App_Dialog_Light){
+                    @Override
+                    public void onPositiveActionClicked(DialogFragment fragment) {
+                        RecurringPickerDialog dialog = (RecurringPickerDialog)fragment.getDialog();
+                        Toast.makeText(fragment.getActivity(), dialog.getRecurring().toString(), Toast.LENGTH_LONG).show();
+                        fragment.dismiss();
+                    }
+
+                    @Override
+                    public void onNegativeActionClicked(DialogFragment fragment) {
+                        Toast.makeText(fragment.getActivity(), "Cancelled", Toast.LENGTH_SHORT).show();
+                        fragment.dismiss();
+                    }
+                };
+                Recurring recurring = new Recurring();
+                recurring.setStartTime(System.currentTimeMillis());
+                recurring.setRepeatMode(Recurring.REPEAT_WEEKLY);
+                recurring.setEnabledWeekday(Calendar.SUNDAY, true);
+                recurring.setEnabledWeekday(Calendar.TUESDAY, true);
+                builder.recurring(recurring)
+                        .datePickerLayoutStyle(R.style.Material_App_Dialog_DatePicker_Light)
+                        .positiveAction("OK")
+                        .negativeAction("CANCEL");
+
+                DialogFragment fragment = DialogFragment.newInstance(builder);
+                fragment.show(getFragmentManager(), null);
+            }
+        });
 
 		return v;
 	}
diff --git a/app/src/main/java/com/rey/material/demo/DialogsFragment.java b/app/src/main/java/com/rey/material/demo/DialogsFragment.java
index 5c8de021..2ae1b7a0 100644
--- a/app/src/main/java/com/rey/material/demo/DialogsFragment.java
+++ b/app/src/main/java/com/rey/material/demo/DialogsFragment.java
@@ -16,6 +16,7 @@
 import com.rey.material.app.SimpleDialog;
 import com.rey.material.app.TimePickerDialog;
 import com.rey.material.widget.Button;
+import com.rey.material.widget.EditText;
 
 import java.text.SimpleDateFormat;
 
@@ -134,15 +135,14 @@ public void onNegativeActionClicked(DialogFragment fragment) {
                 builder = new SimpleDialog.Builder(R.style.SimpleDialog){
 
                     @Override
-                    protected Dialog onBuild(Context context, int styleId) {
-                        Dialog dialog = super.onBuild(context, styleId);
+                    protected void onBuildDone(Dialog dialog) {
                         dialog.layoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-                        return dialog;
                     }
 
                     @Override
                     public void onPositiveActionClicked(DialogFragment fragment) {
-                        Toast.makeText(fragment.getDialog().getContext(), "Connected", Toast.LENGTH_SHORT).show();
+                        EditText et_pass = (EditText)fragment.getDialog().findViewById(R.id.custom_et_password);
+                        Toast.makeText(fragment.getDialog().getContext(), "Connected. pass=" + et_pass.getText().toString(), Toast.LENGTH_SHORT).show();
                         super.onPositiveActionClicked(fragment);
                     }
 
diff --git a/app/src/main/java/com/rey/material/demo/SliderFragment.java b/app/src/main/java/com/rey/material/demo/SliderFragment.java
index c9abe2ef..397f4cde 100644
--- a/app/src/main/java/com/rey/material/demo/SliderFragment.java
+++ b/app/src/main/java/com/rey/material/demo/SliderFragment.java
@@ -4,14 +4,11 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.transition.Slide;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CompoundButton;
 import android.widget.TextView;
 
-import com.rey.material.widget.RadioButton;
 import com.rey.material.widget.Slider;
 
 public class SliderFragment extends Fragment{
@@ -33,7 +30,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         tv_continuous.setText(String.format("pos=%.1f value=%d", sl_continuous.getPosition(), sl_continuous.getValue()));
         sl_continuous.setOnPositionChangeListener(new Slider.OnPositionChangeListener() {
             @Override
-            public void onPositionChanged(Slider view, float oldPos, float newPos, int oldValue, int newValue) {
+            public void onPositionChanged(Slider view, boolean fromUser, float oldPos, float newPos, int oldValue, int newValue) {
                 tv_continuous.setText(String.format("pos=%.1f value=%d", newPos, newValue));
             }
         });
@@ -43,7 +40,7 @@ public void onPositionChanged(Slider view, float oldPos, float newPos, int oldVa
         tv_discrete.setText(String.format("pos=%.1f value=%d", sl_discrete.getPosition(), sl_discrete.getValue()));
         sl_discrete.setOnPositionChangeListener(new Slider.OnPositionChangeListener() {
             @Override
-            public void onPositionChanged(Slider view, float oldPos, float newPos, int oldValue, int newValue) {
+            public void onPositionChanged(Slider view, boolean fromUser, float oldPos, float newPos, int oldValue, int newValue) {
                 tv_discrete.setText(String.format("pos=%.1f value=%d", newPos, newValue));
             }
         });
diff --git a/app/src/main/java/com/rey/material/demo/SnackbarFragment.java b/app/src/main/java/com/rey/material/demo/SnackbarFragment.java
index e7369cc1..9269679e 100644
--- a/app/src/main/java/com/rey/material/demo/SnackbarFragment.java
+++ b/app/src/main/java/com/rey/material/demo/SnackbarFragment.java
@@ -35,7 +35,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 			
 			@Override
 			public void onClick(View v) {
-				if(mSnackBar.getState() == SnackBar.STATE_SHOWED)
+				if(mSnackBar.getState() == SnackBar.STATE_SHOWN)
 					mSnackBar.dismiss();
 				else{
 					switch (v.getId()) {
diff --git a/app/src/main/java/com/rey/material/demo/SpinnersFragment.java b/app/src/main/java/com/rey/material/demo/SpinnersFragment.java
index bd10789d..567f1b8c 100644
--- a/app/src/main/java/com/rey/material/demo/SpinnersFragment.java
+++ b/app/src/main/java/com/rey/material/demo/SpinnersFragment.java
@@ -32,7 +32,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
         Spinner spn_label = (Spinner)v.findViewById(R.id.spinner_label);
         Spinner spn_no_arrow = (Spinner)v.findViewById(R.id.spinner_no_arrow);
-        ArrayAdapter<String> adapter = new ArrayAdapter<>(getActivity(), R.layout.row_spn, new String[]{"Item 1", "Item 2", "Item 333333333333333"});
+		String[] items = new String[20];
+		for(int i = 0; i < items.length; i++)
+			items[i] = String.valueOf(i + 1);
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(getActivity(), R.layout.row_spn, items);
         adapter.setDropDownViewResource(R.layout.row_spn_dropdown);
         spn_label.setAdapter(adapter);
         spn_no_arrow.setAdapter(adapter);
diff --git a/app/src/main/res/layout/dialog_recurring.xml b/app/src/main/res/layout/dialog_recurring.xml
index 260a9850..34623aa7 100644
--- a/app/src/main/res/layout/dialog_recurring.xml
+++ b/app/src/main/res/layout/dialog_recurring.xml
@@ -25,7 +25,7 @@
             app:spn_arrowColor="#FFFFFFFF"
             app:spn_dividerHeight="0dp"
             app:rd_style="@style/Material.Drawable.Ripple.Wave"
-            android:layout_gravity="center_vertical"/>
+            android:layout_gravity="start|center_vertical"/>
 
     </FrameLayout>
 
@@ -98,6 +98,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                android:textDirection="locale"
                 android:textColor="@color/abc_primary_text_material_light"
                 android:text="@string/rd_month_same_day"
                 android:gravity="center_vertical"
@@ -109,6 +110,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                android:textDirection="locale"
                 android:textColor="@color/abc_primary_text_material_light"
                 tools:text="@string/rd_month_last"
                 android:gravity="center_vertical"/>
@@ -117,7 +119,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingTop="8dp"
-                android:layout_marginLeft="-8dp">
+                android:layout_marginLeft="-8dp"
+                android:layout_marginStart="-8dp">
 
                 <com.rey.material.widget.Spinner
                     style="@style/Material.Widget.Spinner"
@@ -137,6 +140,7 @@
                     android:singleLine="true"
                     android:inputType="number"
                     android:layout_toRightOf="@id/rd_spn_end"
+                    android:layout_toEndOf="@id/rd_spn_end"
                     android:layout_centerVertical="true"
                     app:et_labelEnable="false"
                     app:et_inputId="@+id/rd_et_end_num_input"
@@ -149,7 +153,9 @@
                     android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                     android:textColor="@color/abc_primary_text_material_light"
                     android:layout_toRightOf="@id/rd_et_end_num"
+                    android:layout_toEndOf="@id/rd_et_end_num"
                     android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
                     android:layout_centerVertical="true"
                     android:singleLine="true"
                     android:ellipsize="end"
@@ -161,6 +167,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_toRightOf="@id/rd_spn_end"
+                    android:layout_toEndOf="@id/rd_spn_end"
                     android:singleLine="true"
                     android:ellipsize="end"
                     android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/fragment_button.xml b/app/src/main/res/layout/fragment_button.xml
index cbc86fb5..24adec34 100644
--- a/app/src/main/res/layout/fragment_button.xml
+++ b/app/src/main/res/layout/fragment_button.xml
@@ -53,7 +53,7 @@
 		        android:textColor="#FF2196F3"
 		        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
 		        android:text="BUTTON"
-		        app:rd_delayClick="true"/>
+		        app:rd_delayClick="afterRelease"/>
 	        
 	    </LinearLayout>
 	    
@@ -89,7 +89,7 @@
 		        android:textColor="#FF2196F3"
 		        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
 		        android:text="BUTTON"
-		        app:rd_delayClick="true"/>
+		        app:rd_delayClick="afterRelease"/>
 	        
 	    </LinearLayout>
 	    
@@ -133,7 +133,7 @@
 		        android:textColor="#FFFFFFFF"
 		        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
 		        android:text="BUTTON"
-		        app:rd_delayClick="true"/>
+		        app:rd_delayClick="afterRelease"/>
 	        
 	    </LinearLayout>
 	    
@@ -169,7 +169,7 @@
 		        android:textColor="#FFFFFFFF"
 		        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
 		        android:text="BUTTON"
-		        app:rd_delayClick="true"/>
+		        app:rd_delayClick="afterRelease"/>
 	        
 	    </LinearLayout>
 	    
diff --git a/app/src/main/res/layout/fragment_spinner.xml b/app/src/main/res/layout/fragment_spinner.xml
index 758ccbb6..35792fbe 100644
--- a/app/src/main/res/layout/fragment_spinner.xml
+++ b/app/src/main/res/layout/fragment_spinner.xml
@@ -21,7 +21,7 @@
             android:minWidth="128dp"
             app:rd_style="@style/Material.Drawable.Ripple.Wave.Light"
             app:rd_enable="true"
-            app:rd_delayClick="false"
+            app:rd_delayClick="none"
             app:spn_labelEnable="true"
             app:spn_label="Spinner with arrow"
             app:spn_arrowSwitchMode="true"
@@ -37,7 +37,7 @@
             android:layout_marginTop="16dp"
             app:rd_style="@style/Material.Drawable.Ripple.Wave.Light"
             app:rd_enable="true"
-            app:rd_delayClick="false"
+            app:rd_delayClick="none"
             app:spn_labelEnable="true"
             app:spn_label="Spinner without arrow"
             app:spn_arrowSize="0dp"
diff --git a/app/src/main/res/layout/fragment_textfield.xml b/app/src/main/res/layout/fragment_textfield.xml
index df726298..b991154b 100644
--- a/app/src/main/res/layout/fragment_textfield.xml
+++ b/app/src/main/res/layout/fragment_textfield.xml
@@ -27,6 +27,7 @@
             app:et_supportMode="none"
             app:et_autoCompleteMode="multi"
             app:et_dividerPadding="4dp"
+            app:cet_spanFontFamily="asset:FreeSans.ttf"
             android:completionThreshold="2"/>
 
         <com.rey.material.widget.EditText
diff --git a/app/src/main/res/layout/layout_dialog_custom.xml b/app/src/main/res/layout/layout_dialog_custom.xml
index bd28a246..cc3ed007 100644
--- a/app/src/main/res/layout/layout_dialog_custom.xml
+++ b/app/src/main/res/layout/layout_dialog_custom.xml
@@ -14,6 +14,7 @@
         app:et_supportMode="none"
         android:hint="Signal strength"
         android:text="Excellent"
+        android:textDirection="locale"
         android:enabled="false"
         android:paddingTop="8dp"/>
 
@@ -26,17 +27,20 @@
         app:et_supportMode="none"
         android:hint="Security"
         android:text="802.1x EAP"
+        android:textDirection="locale"
         android:enabled="false"
         android:paddingTop="8dp"/>
 
     <com.rey.material.widget.EditText
         style="@style/Material.Widget.EditText"
+        android:id="@+id/custom_et_password"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:et_supportMode="charCounter"
         android:textColor="@color/abc_primary_text_material_dark"
         android:textColorHint="@color/abc_secondary_text_material_dark"
         android:hint="Password"
+        android:textDirection="locale"
         android:paddingTop="8dp"
         android:inputType="textPassword"/>
 
diff --git a/app/src/main/res/layout/rd_item_dropdown_end.xml b/app/src/main/res/layout/rd_item_dropdown_end.xml
index 2489a9f4..d0728c4e 100644
--- a/app/src/main/res/layout/rd_item_dropdown_end.xml
+++ b/app/src/main/res/layout/rd_item_dropdown_end.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.rey.material.widget.TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/Material.Drawable.Ripple.Wave.Light"
     android:layout_width="match_parent"
     android:layout_height="32dp"
     android:textAppearance="@style/TextAppearance.AppCompat.Body1"
     android:textColor="@color/abc_primary_text_material_light"
+    android:textDirection="locale"
     android:paddingLeft="8dp"
     android:paddingRight="8dp"
     android:gravity="center_vertical"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/rd_item_dropdown_mode.xml b/app/src/main/res/layout/rd_item_dropdown_mode.xml
index 2489a9f4..d0728c4e 100644
--- a/app/src/main/res/layout/rd_item_dropdown_mode.xml
+++ b/app/src/main/res/layout/rd_item_dropdown_mode.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.rey.material.widget.TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/Material.Drawable.Ripple.Wave.Light"
     android:layout_width="match_parent"
     android:layout_height="32dp"
     android:textAppearance="@style/TextAppearance.AppCompat.Body1"
     android:textColor="@color/abc_primary_text_material_light"
+    android:textDirection="locale"
     android:paddingLeft="8dp"
     android:paddingRight="8dp"
     android:gravity="center_vertical"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/rd_item_end.xml b/app/src/main/res/layout/rd_item_end.xml
index d599d91f..741c8899 100644
--- a/app/src/main/res/layout/rd_item_end.xml
+++ b/app/src/main/res/layout/rd_item_end.xml
@@ -4,5 +4,6 @@
     android:layout_height="wrap_content"
     android:textAppearance="@style/TextAppearance.AppCompat.Body1"
     android:textColor="@color/abc_primary_text_material_light"
+    android:textDirection="locale"
     android:paddingRight="8dp"
     android:gravity="center_vertical"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/rd_item_mode.xml b/app/src/main/res/layout/rd_item_mode.xml
index 52c8afd3..6de8d9ce 100644
--- a/app/src/main/res/layout/rd_item_mode.xml
+++ b/app/src/main/res/layout/rd_item_mode.xml
@@ -4,5 +4,6 @@
     android:layout_height="wrap_content"
     android:textAppearance="@style/TextAppearance.AppCompat.Body1"
     android:textColor="#FFFFFFFF"
+    android:textDirection="locale"
     android:paddingRight="8dp"
     android:gravity="center_vertical"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_spn.xml b/app/src/main/res/layout/row_spn.xml
index 1b8364ba..57f0c688 100644
--- a/app/src/main/res/layout/row_spn.xml
+++ b/app/src/main/res/layout/row_spn.xml
@@ -10,5 +10,5 @@
 	    android:textColor="#FF000000"
 	    android:paddingLeft="16dp"
 	    android:paddingRight="16dp"
-		app:rd_delayClick="true"/>
+		app:rd_delayClick="afterRelease"/>
 
diff --git a/app/src/main/res/layout/row_spn_dropdown.xml b/app/src/main/res/layout/row_spn_dropdown.xml
index 27677bb9..b623d14d 100644
--- a/app/src/main/res/layout/row_spn_dropdown.xml
+++ b/app/src/main/res/layout/row_spn_dropdown.xml
@@ -10,5 +10,5 @@
 	    android:textColor="#FF000000"
 	    android:paddingLeft="16dp"
 	    android:paddingRight="16dp"
-		app:rd_delayClick="true"/>
+		app:rd_delayClick="afterRelease"/>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bf915131..b751b883 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -25,9 +25,8 @@
         <item name="nd_icon">@style/NavigatorDrawableIcon</item>
     </style>
     
-    <style name="ToolbarRippleStyle" parent="Material.Drawable.Ripple.Touch">
-        <item name="rd_backgroundColor">#00000000</item>
-        <item name="rd_maxRippleRadius">48dp</item>
+    <style name="ToolbarRippleStyle" parent="Material.Drawable.Ripple.Touch.MatchView.Light">
+        <item name="rd_backgroundColor">@android:color/transparent</item>
         <item name="rd_rippleColor">#33FFFFFF</item>
     </style>
     
@@ -203,14 +202,14 @@
         <item name="fab_backgroundColor">#FFDFDFDF</item>
         <item name="fab_elevation">4dp</item>
         <item name="fab_iconLineMorphing">@style/FloatingActionButtonIcon.Light</item>
-        <item name="rd_delayClick">false</item>
+        <item name="rd_delayClick">none</item>
     </style>
 
     <style name="FloatingWaveActionButton" parent="Material.Drawable.Ripple.Wave.Light">
         <item name="fab_backgroundColor">#FFDFDFDF</item>
         <item name="fab_elevation">4dp</item>
         <item name="fab_iconLineMorphing">@style/FloatingActionButtonIcon.Light</item>
-        <item name="rd_delayClick">false</item>
+        <item name="rd_delayClick">none</item>
     </style>
 
     <style name="FloatingColorActionButton" parent="Material.Drawable.Ripple.Touch.Light">
@@ -218,7 +217,7 @@
         <item name="fab_backgroundColor">#FF2196F3</item>
         <item name="fab_elevation">4dp</item>
         <item name="fab_iconLineMorphing">@style/FloatingActionButtonIcon</item>
-        <item name="rd_delayClick">true</item>
+        <item name="rd_delayClick">untilRelease</item>
     </style>
 
     <style name="FloatingWaveColorActionButton" parent="Material.Drawable.Ripple.Wave.Light">
@@ -226,7 +225,7 @@
         <item name="fab_backgroundColor">#FF2196F3</item>
         <item name="fab_elevation">4dp</item>
         <item name="fab_iconLineMorphing">@style/FloatingActionButtonIcon</item>
-        <item name="rd_delayClick">true</item>
+        <item name="rd_delayClick">afterRelease</item>
     </style>
 
     <style name="FloatingActionButtonIcon" >
@@ -270,7 +269,7 @@
 
     <style name="ReplacementContactView" parent="Material.Drawable.Ripple.Wave.Light">
         <item name="rd_cornerRadius">0dp</item>
-        <item name="rd_delayClick">false</item>
+        <item name="rd_delayClick">none</item>
 
         <item name="android:minHeight">56dp</item>
         <item name="cv_buttonSize">0dp</item>
@@ -285,7 +284,7 @@
     <style name="SelectedContactView" parent="Material.Drawable.Ripple.Wave.Light">
         <item name="android:background">#FF00B8D4</item>
         <item name="rd_cornerRadius">0dp</item>
-        <item name="rd_delayClick">false</item>
+        <item name="rd_delayClick">none</item>
 
         <item name="android:minHeight">72dp</item>
         <item name="cv_buttonSrc">@drawable/ic_cancel_white_24dp</item>
diff --git a/gradle.properties b/gradle.properties
index 7b3df5fc..68cbc60d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,8 +17,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=1.1.0
-VERSION_CODE=4
+VERSION_NAME=1.1.1-SNAPSHOT
+VERSION_CODE=5
 GROUP=com.github.rey5137
 
 POM_DESCRIPTION= An Android library to bring Material Design UI to pre-Lolipop Android.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e760..e7faee01 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=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
diff --git a/lib/build.gradle b/lib/build.gradle
index a61b993e..3e727155 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 21
-        versionCode 3
-        versionName "1.0.1"
+        versionCode 5
+        versionName "1.1.1"
     }
     buildTypes {
         release {
diff --git a/lib/lib.iml b/lib/lib.iml
index 4b37c4f3..63928270 100644
--- a/lib/lib.iml
+++ b/lib/lib.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":lib" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.rey5137" external.system.module.version="1.1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":lib" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.rey5137" external.system.module.version="1.1.1-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
diff --git a/lib/src/main/java/com/rey/material/app/DatePickerDialog.java b/lib/src/main/java/com/rey/material/app/DatePickerDialog.java
index 04e415e4..b08c8cea 100644
--- a/lib/src/main/java/com/rey/material/app/DatePickerDialog.java
+++ b/lib/src/main/java/com/rey/material/app/DatePickerDialog.java
@@ -36,7 +36,20 @@ public class DatePickerDialog extends Dialog {
     private DatePickerLayout mDatePickerLayout;
     private float mCornerRadius;
 
+    /**
+     * Interface definition for a callback to be invoked when the selected date is changed.
+     */
     public interface OnDateChangedListener{
+
+        /**
+         * Called when the selected date is changed.
+         * @param oldDay The day value of old date.
+         * @param oldMonth The month value of old date.
+         * @param oldYear The year value of old date.
+         * @param newDay The day value of new date.
+         * @param newMonth The month value of new date.
+         * @param newYear The year value of new date.
+         */
         public void onDateChanged(int oldDay, int oldMonth, int oldYear, int newDay, int newMonth, int newYear);
     }
 
@@ -79,43 +92,88 @@ public Dialog cornerRadius(float radius){
         return super.cornerRadius(radius);
     }
 
+    /**
+     * Set the range of selectable dates.
+     * @param minDay The day value of minimum date.
+     * @param minMonth The month value of minimum date.
+     * @param minYear The year value of minimum date.
+     * @param maxDay The day value of maximum date.
+     * @param maxMonth The month value of maximum date.
+     * @param maxYear The year value of maximum date.
+     * @return The DatePickerDialog for chaining methods.
+     */
     public DatePickerDialog dateRange(int minDay, int minMonth, int minYear, int maxDay, int maxMonth, int maxYear){
         mDatePickerLayout.setDateRange(minDay, minMonth, minYear, maxDay, maxMonth, maxYear);
         return this;
     }
 
+    /**
+     * Set the range of selectable dates.
+     * @param minTime The minimum date in milis.
+     * @param maxTime The maximum date in milis
+     * @return The DatePickerDialog for chaining methods.
+     */
     public DatePickerDialog dateRange(long minTime, long maxTime){
         mDatePickerLayout.setDateRange(minTime, maxTime);
         return this;
     }
 
+    /**
+     * Set the selected date of this DatePickerDialog.
+     * @param day The day value of selected date.
+     * @param month The month value of selected date.
+     * @param year The year value of selected date.
+     * @return The DatePickerDialog for chaining methods.
+     */
     public DatePickerDialog date(int day, int month, int year){
         mDatePickerLayout.setDate(day, month, year);
         return this;
     }
 
+    /**
+     * Set the selected date of this DatePickerDialog.
+     * @param time The date in milis.
+     * @return The DatePickerDialog for chaining methods.
+     */
     public DatePickerDialog date(long time){
         mDatePickerLayout.setDate(time);
         return this;
     }
 
+    /**
+     * Set the listener will be called when the selected date is changed.
+     * @param listener The {@link DatePickerDialog.OnDateChangedListener} will be called.
+     * @return The DatePickerDialog for chaining methods.
+     */
     public DatePickerDialog onDateChangedListener(OnDateChangedListener listener){
         mOnDateChangedListener = listener;
         return this;
     }
 
+    /**
+     * @return The day value of selected date.
+     */
     public int getDay(){
         return mDatePickerLayout.getDay();
     }
 
+    /**
+     * @return The month value of selected date.
+     */
     public int getMonth(){
         return mDatePickerLayout.getMonth();
     }
 
+    /**
+     * @return The year value of selected date.
+     */
     public int getYear(){
         return mDatePickerLayout.getYear();
     }
 
+    /**
+     * @return The selected date.
+     */
     public long getDate(){
         Calendar cal = getCalendar();
         cal.set(Calendar.MILLISECOND, 0);
@@ -132,6 +190,11 @@ public Calendar getCalendar(){
         return mDatePickerLayout.getCalendar();
     }
 
+    /**
+     * Get the formatted string of selected date.
+     * @param formatter The DateFormat used to format the date.
+     * @return
+     */
     public String getFormattedDate(DateFormat formatter){
         return mDatePickerLayout.getFormattedDate(formatter);
     }
@@ -177,7 +240,8 @@ private class DatePickerLayout extends FrameLayout implements DatePicker.OnDateC
         private float mSecondWidth;
 
         private static final String BASE_TEXT = "0";
-        private static final String DAY_FORMAT = "%02d";
+        private static final String DAY_FORMAT = "%2d";
+        private static final String YEAR_FORMAT = "%4d";
 
         public DatePickerLayout(Context context) {
             super(context);
@@ -367,7 +431,7 @@ public void onDateChanged(int oldDay, int oldMonth, int oldYear, int newDay, int
                 mWeekDay = cal.getDisplayName(Calendar.DAY_OF_WEEK, Calendar.LONG, Locale.getDefault());
                 mMonth = cal.getDisplayName(Calendar.MONTH, Calendar.SHORT, Locale.getDefault());
                 mDay = String.format(DAY_FORMAT, newDay);
-                mYear = String.valueOf(newYear);
+                mYear = String.format(YEAR_FORMAT, newYear);
 
                 if(oldMonth != newMonth || oldYear != newYear)
                     mDatePicker.goTo(newMonth, newYear);
diff --git a/lib/src/main/java/com/rey/material/app/Dialog.java b/lib/src/main/java/com/rey/material/app/Dialog.java
index 4c9af514..14f25cb8 100644
--- a/lib/src/main/java/com/rey/material/app/Dialog.java
+++ b/lib/src/main/java/com/rey/material/app/Dialog.java
@@ -11,6 +11,7 @@
 import android.os.Handler;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.v4.view.ViewCompat;
 import android.support.v7.widget.CardView;
 import android.text.TextUtils;
 import android.util.TypedValue;
@@ -79,8 +80,21 @@ public void run() {
     private boolean mCancelable = true;
     private boolean mCanceledOnTouchOutside = true;
 
+    /**
+     * The viewId of title view.
+     */
+    public static final int TITLE = ViewUtil.generateViewId();
+    /**
+     * The viewId of positive action button.
+     */
     public static final int ACTION_POSITIVE = ViewUtil.generateViewId();
+    /**
+     * The viewId of negative action button.
+     */
     public static final int ACTION_NEGATIVE = ViewUtil.generateViewId();
+    /**
+     * The viewId of neutral action button.
+     */
     public static final int ACTION_NEUTRAL = ViewUtil.generateViewId();
 
     public Dialog(Context context) {
@@ -120,6 +134,8 @@ private void init(Context context, int style){
         mCardView.setPreventCornerOverlap(false);
         mCardView.setUseCompatPadding(true);
 
+        mTitle.setId(TITLE);
+        mTitle.setGravity(Gravity.START);
         mTitle.setPadding(mContentPadding, mContentPadding, mContentPadding, mContentPadding - mActionPadding);
         mPositiveAction.setId(ACTION_POSITIVE);
         mPositiveAction.setPadding(mActionPadding, 0, mActionPadding, 0);
@@ -173,6 +189,7 @@ public Dialog applyStyle(int resId){
         maxElevation(a.getDimensionPixelOffset(R.styleable.Dialog_di_maxElevation, 0));
         elevation(a.getDimensionPixelOffset(R.styleable.Dialog_di_elevation, ThemeUtil.dpToPx(context, 4)));
         cornerRadius(a.getDimensionPixelOffset(R.styleable.Dialog_di_cornerRadius, ThemeUtil.dpToPx(context, 2)));
+        layoutDirection(a.getInteger(R.styleable.Dialog_di_layoutDirection, View.LAYOUT_DIRECTION_LOCALE));
 
         titleTextAppearance(a.getResourceId(R.styleable.Dialog_di_titleTextAppearance, R.style.TextAppearance_AppCompat_Title));
         if(ThemeUtil.getType(a, R.styleable.Dialog_di_titleTextColor) != TypedValue.TYPE_NULL)
@@ -236,6 +253,10 @@ public Dialog applyStyle(int resId){
         return this;
     }
 
+    /**
+     * Clear the content of this Dialog.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog clearContent(){
         title(0);
         positiveAction(0);
@@ -248,12 +269,23 @@ public Dialog clearContent(){
         return this;
     }
 
+    /**
+     * Set the params of this Dialog layout.
+     * @param width The width param. Can be the size in pixels, or {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT} or {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT}.
+     * @param height The height param. Can be the size in pixels, or {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT} or {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT}.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog layoutParams(int width, int height){
         mLayoutWidth = width;
         mLayoutHeight = height;
         return this;
     }
 
+    /**
+     * Set the dim amount of the region outside this Dialog.
+     * @param amount The dim amount in [0..1].
+     * @return The Dialog for chaining methods.
+     */
     public Dialog dimAmount(float amount){
         Window window = getWindow();
         if(amount > 0f){
@@ -267,45 +299,85 @@ public Dialog dimAmount(float amount){
         return this;
     }
 
+    /**
+     * Set the background color of this Dialog
+     * @param color The color value.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog backgroundColor(int color){
         mCardView.setCardBackgroundColor(color);
         return this;
     }
 
-    public Dialog elevation(float radius){
-        if(mCardView.getMaxCardElevation() < radius)
-            mCardView.setMaxCardElevation(radius);
+    /**
+     * Set the elevation value of this Dialog.
+     * @param elevation
+     * @return The Dialog for chaining methods.
+     */
+    public Dialog elevation(float elevation){
+        if(mCardView.getMaxCardElevation() < elevation)
+            mCardView.setMaxCardElevation(elevation);
 
-        mCardView.setCardElevation(radius);
+        mCardView.setCardElevation(elevation);
         return this;
     }
 
-    public Dialog maxElevation(float radius){
-        mCardView.setMaxCardElevation(radius);
+    /**
+     * Set the maximum elevation value of this Dialog.
+     * @param elevation
+     * @return The Dialog for chaining methods.
+     */
+    public Dialog maxElevation(float elevation){
+        mCardView.setMaxCardElevation(elevation);
         return this;
     }
 
+    /**
+     * Set the corner radius of this Dialog.
+     * @param radius The corner radius.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog cornerRadius(float radius){
         mCardView.setRadius(radius);
         return this;
     }
 
+    /**
+     * Set the divider's color of this Dialog.
+     * @param color The color value.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog dividerColor(int color){
         mCardView.setDividerColor(color);
         return this;
     }
 
+    /**
+     * Set the height of divider of this Dialog.
+     * @param height The size value in pixels.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog dividerHeight(int height){
         mCardView.setDividerHeight(height);
         return this;
     }
 
+    /**
+     * Set the title of this Dialog.
+     * @param title The title text.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog title(CharSequence title){
         mTitle.setText(title);
         mTitle.setVisibility(TextUtils.isEmpty(title) ? View.GONE : View.VISIBLE);
         return this;
     }
 
+    /**
+     * Set the title of this Dialog.
+     * @param id The resourceId of text.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog title(int id){
         return title(id == 0 ? null : getContext().getResources().getString(id));
     }
@@ -320,16 +392,31 @@ public void setTitle(int titleId) {
         title(titleId);
     }
 
+    /**
+     * Set the text's color of Dialog's title.
+     * @param color The color value.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog titleColor(int color){
         mTitle.setTextColor(color);
         return this;
     }
 
+    /**
+     * Sets the text color, size, style of the title view from the specified TextAppearance resource.
+     * @param resId The resourceId value.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog titleTextAppearance(int resId){
         mTitle.setTextAppearance(getContext(), resId);
         return this;
     }
 
+    /**
+     * Set the background drawable of all action buttons.
+     * @param id The resourceId of drawable.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog actionBackground(int id){
         positiveActionBackground(id);
         negativeActionBackground(id);
@@ -337,6 +424,11 @@ public Dialog actionBackground(int id){
         return this;
     }
 
+    /**
+     * Set the background drawable of all action buttons.
+     * @param drawable The background drawable.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog actionBackground(Drawable drawable){
         positiveActionBackground(drawable);
         negativeActionBackground(drawable);
@@ -344,6 +436,11 @@ public Dialog actionBackground(Drawable drawable){
         return this;
     }
 
+    /**
+     * Set the RippleEffect of all action buttons.
+     * @param resId The resourceId of style.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog actionRipple(int resId){
         positiveActionRipple(resId);
         negativeActionRipple(resId);
@@ -351,6 +448,11 @@ public Dialog actionRipple(int resId){
         return this;
     }
 
+    /**
+     * Sets the text color, size, style of all action buttons from the specified TextAppearance resource.
+     * @param resId The resourceId value.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog actionTextAppearance(int resId){
         positiveActionTextAppearance(resId);
         negativeActionTextAppearance(resId);
@@ -358,6 +460,11 @@ public Dialog actionTextAppearance(int resId){
         return this;
     }
 
+    /**
+     * Sets the text color of all action buttons.
+     * @param color
+     * @return The Dialog for chaining methods.
+     */
     public Dialog actionTextColor(ColorStateList color){
         positiveActionTextColor(color);
         negativeActionTextColor(color);
@@ -365,6 +472,11 @@ public Dialog actionTextColor(ColorStateList color){
         return this;
     }
 
+    /**
+     * Sets the text color of all action buttons.
+     * @param color
+     * @return The Dialog for chaining methods.
+     */
     public Dialog actionTextColor(int color){
         positiveActionTextColor(color);
         negativeActionTextColor(color);
@@ -372,168 +484,318 @@ public Dialog actionTextColor(int color){
         return this;
     }
 
+    /**
+     * Set the text of positive action button.
+     * @param action
+     * @return The Dialog for chaining methods.
+     */
     public Dialog positiveAction(CharSequence action){
         mPositiveAction.setText(action);
         mPositiveAction.setVisibility(TextUtils.isEmpty(action) ? View.GONE : View.VISIBLE);
         return this;
     }
 
+    /**
+     * Set the text of positive action button.
+     * @param id The resourceId of text.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog positiveAction(int id){
         return positiveAction(id == 0 ? null : getContext().getResources().getString(id));
     }
 
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-    @SuppressWarnings("deprecation")
+    /**
+     * Set the background drawable of positive action button.
+     * @param drawable The background drawable.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog positiveActionBackground(Drawable drawable){
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
-            mPositiveAction.setBackground(drawable);
-        else
-            mPositiveAction.setBackgroundDrawable(drawable);
+        ViewUtil.setBackground(mPositiveAction, drawable);
         return this;
     }
 
+    /**
+     * Set the background drawable of positive action button.
+     * @param id The resourceId of drawable.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog positiveActionBackground(int id){
         return positiveActionBackground(id == 0 ? null : getContext().getResources().getDrawable(id));
     }
 
+    /**
+     * Set the RippleEffect of positive action button.
+     * @param resId The resourceId of style.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog positiveActionRipple(int resId){
         RippleDrawable drawable = new RippleDrawable.Builder(getContext(), resId).build();
         return positiveActionBackground(drawable);
     }
 
+    /**
+     * Sets the text color, size, style of positive action button from the specified TextAppearance resource.
+     * @param resId The resourceId value.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog positiveActionTextAppearance(int resId){
         mPositiveAction.setTextAppearance(getContext(), resId);
         return this;
     }
 
+    /**
+     * Sets the text color of positive action button.
+     * @param color
+     * @return The Dialog for chaining methods.
+     */
     public Dialog positiveActionTextColor(ColorStateList color){
         mPositiveAction.setTextColor(color);
         return this;
     }
 
+    /**
+     * Sets the text color of positive action button.
+     * @param color
+     * @return The Dialog for chaining methods.
+     */
     public Dialog positiveActionTextColor(int color){
         mPositiveAction.setTextColor(color);
         return this;
     }
 
+    /**
+     * Set a listener will be called when positive action button is clicked.
+     * @param listener The {@link android.view.View.OnClickListener} will be called.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog positiveActionClickListener(View.OnClickListener listener){
         mPositiveAction.setOnClickListener(listener);
         return this;
     }
 
+    /**
+     * Set the text of negative action button.
+     * @param action
+     * @return The Dialog for chaining methods.
+     */
     public Dialog negativeAction(CharSequence action){
         mNegativeAction.setText(action);
         mNegativeAction.setVisibility(TextUtils.isEmpty(action) ? View.GONE : View.VISIBLE);
         return this;
     }
 
+    /**
+     * Set the text of negative action button.
+     * @param id The resourceId of text.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog negativeAction(int id){
         return negativeAction(id == 0 ? null : getContext().getResources().getString(id));
     }
 
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-    @SuppressWarnings("deprecation")
+    /**
+     * Set the background drawable of negative action button.
+     * @param drawable The background drawable.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog negativeActionBackground(Drawable drawable){
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
-            mNegativeAction.setBackground(drawable);
-        else
-            mNegativeAction.setBackgroundDrawable(drawable);
+        ViewUtil.setBackground(mNegativeAction, drawable);
         return this;
     }
 
+    /**
+     * Set the background drawable of neagtive action button.
+     * @param id The resourceId of drawable.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog negativeActionBackground(int id){
         return negativeActionBackground(id == 0 ? null : getContext().getResources().getDrawable(id));
     }
 
+    /**
+     * Set the RippleEffect of negative action button.
+     * @param resId The resourceId of style.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog negativeActionRipple(int resId){
         RippleDrawable drawable = new RippleDrawable.Builder(getContext(), resId).build();
         return negativeActionBackground(drawable);
     }
 
+    /**
+     * Sets the text color, size, style of negative action button from the specified TextAppearance resource.
+     * @param resId The resourceId value.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog negativeActionTextAppearance(int resId){
         mNegativeAction.setTextAppearance(getContext(), resId);
         return this;
     }
 
+    /**
+     * Sets the text color of negative action button.
+     * @param color
+     * @return The Dialog for chaining methods.
+     */
     public Dialog negativeActionTextColor(ColorStateList color){
         mNegativeAction.setTextColor(color);
         return this;
     }
 
+    /**
+     * Sets the text color of negative action button.
+     * @param color
+     * @return The Dialog for chaining methods.
+     */
     public Dialog negativeActionTextColor(int color){
         mNegativeAction.setTextColor(color);
         return this;
     }
 
+    /**
+     * Set a listener will be called when negative action button is clicked.
+     * @param listener The {@link android.view.View.OnClickListener} will be called.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog negativeActionClickListener(View.OnClickListener listener){
         mNegativeAction.setOnClickListener(listener);
         return this;
     }
 
+    /**
+     * Set the text of neutral action button.
+     * @param action
+     * @return The Dialog for chaining methods.
+     */
     public Dialog neutralAction(CharSequence action){
         mNeutralAction.setText(action);
         mNeutralAction.setVisibility(TextUtils.isEmpty(action) ? View.GONE : View.VISIBLE);
         return this;
     }
 
+    /**
+     * Set the text of neutral action button.
+     * @param id The resourceId of text.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog neutralAction(int id){
         return neutralAction(id == 0 ? null : getContext().getResources().getString(id));
     }
 
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-    @SuppressWarnings("deprecation")
+    /**
+     * Set the background drawable of neutral action button.
+     * @param drawable The background drawable.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog neutralActionBackground(Drawable drawable){
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
-            mNeutralAction.setBackground(drawable);
-        else
-            mNeutralAction.setBackgroundDrawable(drawable);
+        ViewUtil.setBackground(mNeutralAction, drawable);
         return this;
     }
 
+    /**
+     * Set the background drawable of neutral action button.
+     * @param id The resourceId of drawable.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog neutralActionBackground(int id){
         return neutralActionBackground(id == 0 ? null : getContext().getResources().getDrawable(id));
     }
 
+    /**
+     * Set the RippleEffect of neutral action button.
+     * @param resId The resourceId of style.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog neutralActionRipple(int resId){
         RippleDrawable drawable = new RippleDrawable.Builder(getContext(), resId).build();
         return neutralActionBackground(drawable);
     }
 
+    /**
+     * Sets the text color, size, style of neutral action button from the specified TextAppearance resource.
+     * @param resId The resourceId value.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog neutralActionTextAppearance(int resId){
         mNeutralAction.setTextAppearance(getContext(), resId);
         return this;
     }
 
+    /**
+     * Sets the text color of neutral action button.
+     * @param color
+     * @return The Dialog for chaining methods.
+     */
     public Dialog neutralActionTextColor(ColorStateList color){
         mNeutralAction.setTextColor(color);
         return this;
     }
 
+    /**
+     * Sets the text color of neutral action button.
+     * @param color
+     * @return The Dialog for chaining methods.
+     */
     public Dialog neutralActionTextColor(int color){
         mNeutralAction.setTextColor(color);
         return this;
     }
 
+    /**
+     * Set a listener will be called when neutral action button is clicked.
+     * @param listener The {@link android.view.View.OnClickListener} will be called.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog neutralActionClickListener(View.OnClickListener listener){
         mNeutralAction.setOnClickListener(listener);
         return this;
     }
 
+    /**
+     * Set the layout direction of this Dialog
+     * @param direction The layout direction value. Can be {@link android.view.View#LAYOUT_DIRECTION_LTR}, {@link android.view.View#LAYOUT_DIRECTION_RTL} or {@link android.view.View#LAYOUT_DIRECTION_LOCALE}
+     * @return The Dialog for chaining methods.
+     */
+    public Dialog layoutDirection(int direction){
+        ViewCompat.setLayoutDirection(mCardView, direction);
+        return this;
+    }
+
+    /**
+     * Set the animation when Dialog enter the screen.
+     * @param resId The resourceId of animation.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog inAnimation(int resId){
         mInAnimationId = resId;
         return this;
     }
 
+    /**
+     * Set the animation when Dialog exit the screen.
+     * @param resId The resourceId of animation.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog outAnimation(int resId){
         mOutAnimationId = resId;
         return this;
     }
 
+    /**
+     * Indicate that Dialog should show divider when the content is longer than container view.
+     * @param show
+     * @return The Dialog for chaining methods.
+     */
     public Dialog showDivider(boolean show){
         mCardView.setShowDivider(show);
         return this;
     }
 
+    /**
+     * Set the content view of this Dialog.
+     * @param v The content view.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog contentView(View v){
         if(mContent != v) {
             if(mContent != null)
@@ -548,6 +810,11 @@ public Dialog contentView(View v){
         return this;
     }
 
+    /**
+     * Set the content view of this Dialog.
+     * @param layoutId The reourceId of layout.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog contentView(int layoutId){
         if(layoutId == 0)
             return this;
@@ -556,23 +823,49 @@ public Dialog contentView(int layoutId){
         return contentView(v);
     }
 
+    /**
+     * Sets whether this dialog is cancelable with the
+     * {@link android.view.KeyEvent#KEYCODE_BACK BACK} key.
+     *  @return The Dialog for chaining methods.
+     */
     public Dialog cancelable(boolean cancelable){
         super.setCancelable(cancelable);
         mCancelable = cancelable;
         return this;
     }
 
+    /**
+     * Sets whether this dialog is canceled when touched outside the window's
+     * bounds. If setting to true, the dialog is set to be cancelable if not
+     * already set.
+     *
+     * @param cancel Whether the dialog should be canceled when touched outside
+     * @return The Dialog for chaining methods.
+     */
     public Dialog canceledOnTouchOutside(boolean cancel){
         super.setCanceledOnTouchOutside(cancel);
         mCanceledOnTouchOutside = cancel;
         return this;
     }
 
+    /**
+     * Set the margin between content view and Dialog border.
+     * @param margin The margin size in pixels.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog contentMargin(int margin){
         mCardView.setContentMargin(margin);
         return this;
     }
 
+    /**
+     * Set the margin between content view and Dialog border.
+     * @param left The left margin size in pixels.
+     * @param top The top margin size in pixels.
+     * @param right The right margin size in pixels.
+     * @param bottom The bottom margin size in pixels.
+     * @return The Dialog for chaining methods.
+     */
     public Dialog contentMargin(int left, int top, int right, int bottom){
         mCardView.setContentMargin(left, top, right, bottom);
         return this;
@@ -721,6 +1014,8 @@ private class DialogCardView extends CardView{
         private int mContentMarginRight;
         private int mContentMarginBottom;
 
+        private boolean mIsRtl = false;
+
         public DialogCardView(Context context) {
             super(context);
 
@@ -757,6 +1052,26 @@ public void setShowDivider(boolean show){
             }
         }
 
+        @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
+        @Override
+        public void onRtlPropertiesChanged(int layoutDirection) {
+            boolean rtl = layoutDirection == LAYOUT_DIRECTION_RTL;
+            if(mIsRtl != rtl) {
+                mIsRtl = rtl;
+
+                if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1){
+                    int direction = mIsRtl ? TEXT_DIRECTION_RTL : TEXT_DIRECTION_LTR;
+
+                    mTitle.setTextDirection(direction);
+                    mPositiveAction.setTextDirection(direction);
+                    mNegativeAction.setTextDirection(direction);
+                    mNeutralAction.setTextDirection(direction);
+                }
+
+                requestLayout();
+            }
+        }
+
         @Override
         protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
             int widthSize = MeasureSpec.getSize(widthMeasureSpec);
@@ -885,7 +1200,10 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
             childBottom -= getPaddingBottom();
 
             if(mTitle.getVisibility() == View.VISIBLE) {
-                mTitle.layout(childLeft, childTop, childRight, childTop + mTitle.getMeasuredHeight());
+                if(mIsRtl)
+                    mTitle.layout(childRight - mTitle.getMeasuredWidth(), childTop, childRight, childTop + mTitle.getMeasuredHeight());
+                else
+                    mTitle.layout(childLeft, childTop, childLeft + mTitle.getMeasuredWidth(), childTop + mTitle.getMeasuredHeight());
                 childTop += mTitle.getMeasuredHeight();
             }
 
@@ -910,25 +1228,46 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
                 }
             }
             else{
+                int actionLeft = childLeft + mActionOuterPadding;
                 int actionRight = childRight - mActionOuterPadding;
                 int actionTop = childBottom - mActionOuterHeight + temp;
                 int actionBottom = childBottom - temp;
                 boolean hasAction = false;
 
-                if(mPositiveAction.getVisibility() == View.VISIBLE){
-                    mPositiveAction.layout(actionRight - mPositiveAction.getMeasuredWidth(), actionTop, actionRight, actionBottom);
-                    actionRight -= mPositiveAction.getMeasuredWidth() + mActionPadding;
-                    hasAction = true;
-                }
+                if(mIsRtl){
+                    if (mPositiveAction.getVisibility() == View.VISIBLE) {
+                        mPositiveAction.layout(actionLeft , actionTop, actionLeft + mPositiveAction.getMeasuredWidth(), actionBottom);
+                        actionLeft += mPositiveAction.getMeasuredWidth() + mActionPadding;
+                        hasAction = true;
+                    }
+
+                    if (mNegativeAction.getVisibility() == View.VISIBLE) {
+                        mNegativeAction.layout(actionLeft, actionTop, actionLeft + mNegativeAction.getMeasuredWidth(), actionBottom);
+                        hasAction = true;
+                    }
 
-                if(mNegativeAction.getVisibility() == View.VISIBLE) {
-                    mNegativeAction.layout(actionRight - mNegativeAction.getMeasuredWidth(), actionTop, actionRight, actionBottom);
-                    hasAction = true;
+                    if (mNeutralAction.getVisibility() == View.VISIBLE) {
+                        mNeutralAction.layout(actionRight - mNeutralAction.getMeasuredWidth(), actionTop, actionRight, actionBottom);
+                        hasAction = true;
+                    }
                 }
+                else {
+
+                    if (mPositiveAction.getVisibility() == View.VISIBLE) {
+                        mPositiveAction.layout(actionRight - mPositiveAction.getMeasuredWidth(), actionTop, actionRight, actionBottom);
+                        actionRight -= mPositiveAction.getMeasuredWidth() + mActionPadding;
+                        hasAction = true;
+                    }
+
+                    if (mNegativeAction.getVisibility() == View.VISIBLE) {
+                        mNegativeAction.layout(actionRight - mNegativeAction.getMeasuredWidth(), actionTop, actionRight, actionBottom);
+                        hasAction = true;
+                    }
 
-                if(mNeutralAction.getVisibility() == View.VISIBLE) {
-                    mNeutralAction.layout(childLeft + mActionOuterPadding, actionTop, childLeft + mActionOuterPadding + mNeutralAction.getMeasuredWidth(), actionBottom);
-                    hasAction = true;
+                    if (mNeutralAction.getVisibility() == View.VISIBLE) {
+                        mNeutralAction.layout(actionLeft, actionTop, actionLeft + mNeutralAction.getMeasuredWidth(), actionBottom);
+                        hasAction = true;
+                    }
                 }
 
                 if(hasAction)
@@ -1000,6 +1339,10 @@ public Builder neutralAction(CharSequence action){
             return this;
         }
 
+        public Dialog getDialog(){
+            return mDialog;
+        }
+
         @Override
         public void onPositiveActionClicked(DialogFragment fragment) {
             fragment.dismiss();
@@ -1027,13 +1370,29 @@ public Dialog build(Context context) {
             if(mContentViewId != 0)
                 mDialog.contentView(mContentViewId);
 
+            onBuildDone(mDialog);
+
             return mDialog;
         }
 
+        /**
+         * Get a appropriate Dialog instance will be used for styling later.
+         * Child class should override this function to return appropriate Dialog instance.
+         * If you want to apply styling to dialog, or get content view, you should do it in {@link #onBuildDone(Dialog)}
+         * @param context A Context instance.
+         * @param styleId The resourceId of Dialog's style.
+         * @return A Dialog instance will be used for styling later.
+         */
         protected Dialog onBuild(Context context, int styleId){
             return new Dialog(context, styleId);
         }
 
+        /**
+         * This function will be called after Builder done apply styling to Dialog.
+         * @param dialog The Dialog instance.
+         */
+        protected void onBuildDone(Dialog dialog){}
+
         protected Builder(Parcel in) {
             mStyleId = in.readInt();
             mContentViewId = in.readInt();
@@ -1045,8 +1404,16 @@ protected Builder(Parcel in) {
             onReadFromParcel(in);
         }
 
+        /**
+         * Child class should override this function and read back any saved attributes.
+         * All read methods should be called after super.onReadFromParcel() call to keep the order.
+         */
         protected void onReadFromParcel(Parcel in){}
 
+        /**
+         * Child class should override this function and write down all attributes will be saved.
+         * All write methods should be called after super.onWriteToParcel() call to keep the order.
+         */
         protected void onWriteToParcel(Parcel dest, int flags){}
 
         @Override
diff --git a/lib/src/main/java/com/rey/material/app/DialogFragment.java b/lib/src/main/java/com/rey/material/app/DialogFragment.java
index bbd1a84b..fc845bd4 100644
--- a/lib/src/main/java/com/rey/material/app/DialogFragment.java
+++ b/lib/src/main/java/com/rey/material/app/DialogFragment.java
@@ -11,7 +11,15 @@
  */
 public class DialogFragment extends android.support.v4.app.DialogFragment{
 
+    /**
+     * Interface definition for passing style data.
+     */
     public interface Builder{
+        /**
+         * Get a Dialog instance used for this fragment.
+         * @param context A Context instance.
+         * @return The Dialog will be used for this fragment.
+         */
         public com.rey.material.app.Dialog build(Context context);
 
         /**
@@ -61,7 +69,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         com.rey.material.app.Dialog dialog = mBuilder == null ? new Dialog(getActivity()) : mBuilder.build(getActivity());
         dialog.positiveActionClickListener(mActionListener)
                 .negativeActionClickListener(mActionListener)
-                .negativeActionClickListener(mActionListener);
+                .neutralActionClickListener(mActionListener);
         return dialog;
     }
 
diff --git a/lib/src/main/java/com/rey/material/app/SimpleDialog.java b/lib/src/main/java/com/rey/material/app/SimpleDialog.java
index 68787928..ef3a272d 100644
--- a/lib/src/main/java/com/rey/material/app/SimpleDialog.java
+++ b/lib/src/main/java/com/rey/material/app/SimpleDialog.java
@@ -2,8 +2,11 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
+import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.v4.view.ViewCompat;
+import android.text.TextDirectionHeuristic;
 import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.Gravity;
@@ -47,7 +50,15 @@ public class SimpleDialog extends Dialog {
     protected static final int MODE_MULTI_ITEMS = 3;
     protected static final int MODE_CUSTOM = 4;
 
+    /**
+     * Interface definition for a callback to be invoked when the checked state of an item changed.
+     */
     public interface OnSelectionChangedListener{
+        /**
+         * Called when the checked state of an item changed.
+         * @param index The index of item.
+         * @param selected The checked state.
+         */
         public void onSelectionChanged(int index, boolean selected);
     }
 
@@ -124,6 +135,7 @@ private void initScrollView(){
         mScrollView.setClipToPadding(false);
         mScrollView.setFillViewport(true);
         mScrollView.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_OVERLAY);
+        ViewCompat.setLayoutDirection(mScrollView, View.LAYOUT_DIRECTION_INHERIT);
     }
 
     private void initMessageView(){
@@ -133,6 +145,11 @@ private void initMessageView(){
         mMessage.setGravity(Gravity.START | Gravity.CENTER_VERTICAL);
     }
 
+    /**
+     * Set a message text to this SimpleDialog.
+     * @param message
+     * @return The SimpleDialog for chaining methods.
+     */
     public SimpleDialog message(CharSequence message){
         if(mScrollView == null)
             initScrollView();
@@ -153,10 +170,20 @@ public SimpleDialog message(CharSequence message){
         return this;
     }
 
+    /**
+     * Set a message text to this SimpleDialog.
+     * @param id The resourceId of text.
+     * @return The SimpleDialog for chaining methods.
+     */
     public SimpleDialog message(int id){
         return message(id == 0 ? null : getContext().getResources().getString(id));
     }
 
+    /**
+     * Sets the text color, size, style of the message view from the specified TextAppearance resource.
+     * @param resId The resourceId value.
+     * @return The SimpleDialog for chaining methods.
+     */
     public SimpleDialog messageTextAppearance(int resId){
         if(mMessageTextAppearanceId != resId){
             mMessageTextAppearanceId = resId;
@@ -166,6 +193,11 @@ public SimpleDialog messageTextAppearance(int resId){
         return this;
     }
 
+    /**
+     * Sets the text color of the message view.
+     * @param color The color value.
+     * @return The SimpleDialog for chaining methods.
+     */
     public SimpleDialog messageTextColor(int color){
         if(mMessageTextColor != color){
             mMessageTextColor = color;
@@ -175,6 +207,11 @@ public SimpleDialog messageTextColor(int color){
         return this;
     }
 
+    /**
+     * Sets the style of radio button.
+     * @param resId The resourceId of style.
+     * @return The SimpleDialog for chaining methods.
+     */
     public SimpleDialog radioButtonStyle(int resId){
         if(mRadioButtonStyle != resId){
             mRadioButtonStyle = resId;
@@ -184,6 +221,11 @@ public SimpleDialog radioButtonStyle(int resId){
         return this;
     }
 
+    /**
+     * Sets the style of check box.
+     * @param resId The resourceId of style.
+     * @return The SimpleDialog for chaining methods.
+     */
     public SimpleDialog checkBoxStyle(int resId){
         if(mCheckBoxStyle != resId){
             mCheckBoxStyle = resId;
@@ -193,6 +235,11 @@ public SimpleDialog checkBoxStyle(int resId){
         return this;
     }
 
+    /**
+     * Sets the height of item
+     * @param height The size in pixels.
+     * @return The SimpleDialog for chaining methods.
+     */
     public SimpleDialog itemHeight(int height){
         if(mItemHeight != height){
             mItemHeight = height;
@@ -202,6 +249,11 @@ public SimpleDialog itemHeight(int height){
         return this;
     }
 
+    /**
+     * Sets the text color, size, style of the item view from the specified TextAppearance resource.
+     * @param resId The resourceId value.
+     * @return The SimpleDialog for chaining methods.
+     */
     public SimpleDialog itemTextAppearance(int resId){
         if(mItemTextAppearance != resId){
             mItemTextAppearance = resId;
@@ -221,11 +273,18 @@ private void initListView(){
         mListView.setPadding(0, 0, 0, mContentPadding - mActionPadding);
         mListView.setVerticalFadingEdgeEnabled(false);
         mListView.setOverScrollMode(ListView.OVER_SCROLL_NEVER);
+        ViewCompat.setLayoutDirection(mListView, View.LAYOUT_DIRECTION_INHERIT);
 
         mAdapter = new InternalAdapter();
         mListView.setAdapter(mAdapter);
     }
 
+    /**
+     * Set the list of items in single-choice mode.
+     * @param items The list of items.
+     * @param selectedIndex The index of selected item.
+     * @return The SimpleDialog for chaining methods.
+     */
     public SimpleDialog items(CharSequence[] items, int selectedIndex){
         if(mListView == null)
             initListView();
@@ -236,6 +295,12 @@ public SimpleDialog items(CharSequence[] items, int selectedIndex){
         return this;
     }
 
+    /**
+     * Set the list of items in multi-choice mode.
+     * @param items The list of items.
+     * @param selectedIndexes The indexes of selected items.
+     * @return The SimpleDialog for chaining methods.
+     */
     public SimpleDialog multiChoiceItems(CharSequence[] items, int... selectedIndexes){
         if(mListView == null)
             initListView();
@@ -246,33 +311,69 @@ public SimpleDialog multiChoiceItems(CharSequence[] items, int... selectedIndexe
         return this;
     }
 
+    /**
+     * Set a listener will be called when the checked state of a item is changed.
+     * @param listener The {@link SimpleDialog.OnSelectionChangedListener} will be called.
+     * @return The SimpleDialog for chaining methods.
+     */
     public SimpleDialog onSelectionChangedListener(OnSelectionChangedListener listener){
         mOnSelectionChangedListener = listener;
         return this;
     }
 
+    /**
+     * @return The list of index of all selected items.
+     */
     public int[] getSelectedIndexes(){
         return mAdapter == null ? null : mAdapter.getSelectedIndexes();
     }
 
+    /**
+     * @return The list of value of all selected items.
+     */
     public CharSequence[] getSelectedValues(){
         return mAdapter.getSelectedValues();
     }
 
+    /**
+     * @return The index of selected item.
+     */
     public int getSelectedIndex(){
         return mAdapter == null ? -1 : mAdapter.getLastSelectedIndex();
     }
 
+    /**
+     * @return The value of selected item.
+     */
     public CharSequence getSelectedValue(){
         return mAdapter.getLastSelectedValue();
     }
 
     private class InternalScrollView extends ScrollView{
 
+        private boolean mIsRtl = false;
+
         public InternalScrollView(Context context) {
             super(context);
         }
 
+        public void onRtlPropertiesChanged(int layoutDirection) {
+            boolean rtl = layoutDirection == LAYOUT_DIRECTION_RTL;
+            if(mIsRtl != rtl) {
+                mIsRtl = rtl;
+                if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+                    View v = getChildAt(0);
+                    if (v != null && v == mMessage)
+                        mMessage.setTextDirection(mIsRtl ? View.TEXT_DIRECTION_RTL : View.TEXT_DIRECTION_LTR);
+                }
+                requestLayout();
+            }
+        }
+
+        public boolean isLayoutRtl(){
+            return mIsRtl;
+        }
+
         @Override
         protected void onLayout(boolean changed, int l, int t, int r, int b) {
             super.onLayout(changed, l, t, r, b);
@@ -284,10 +385,24 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
 
     private class InternalListView extends ListView{
 
+        private boolean mIsRtl = false;
+
         public InternalListView(Context context) {
             super(context);
         }
 
+        public void onRtlPropertiesChanged(int layoutDirection) {
+            boolean rtl = layoutDirection == LAYOUT_DIRECTION_RTL;
+            if(mIsRtl != rtl) {
+                mIsRtl = rtl;
+                requestLayout();
+            }
+        }
+
+        public boolean isLayoutRtl(){
+            return mIsRtl;
+        }
+
         @Override
         protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
             int heightMode = MeasureSpec.getMode(heightMeasureSpec);
@@ -409,9 +524,11 @@ public View getView(int position, View convertView, ViewGroup parent) {
                 v = (mMode == MODE_MULTI_ITEMS) ? new CheckBox(parent.getContext(), null, 0, mCheckBoxStyle) : new RadioButton(parent.getContext(), null, 0, mRadioButtonStyle);
                 if(mItemHeight != ViewGroup.LayoutParams.WRAP_CONTENT)
                     v.setMinHeight(mItemHeight);
-                v.setGravity(Gravity.START|Gravity.CENTER_VERTICAL);
+                v.setGravity(Gravity.START | Gravity.CENTER_VERTICAL);
+                if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
+                    v.setTextDirection(((InternalListView)parent).isLayoutRtl() ? View.TEXT_DIRECTION_RTL : View.TEXT_DIRECTION_LTR);
                 v.setTextAppearance(v.getContext(), mItemTextAppearance);
-                v.setPadding(mContentPadding, 0, 0, 0);
+                ViewCompat.setPaddingRelative(v, mContentPadding, 0, 0, 0);
             }
 
             v.setTag(position);
diff --git a/lib/src/main/java/com/rey/material/app/TimePickerDialog.java b/lib/src/main/java/com/rey/material/app/TimePickerDialog.java
index 1ab6a019..573839c0 100644
--- a/lib/src/main/java/com/rey/material/app/TimePickerDialog.java
+++ b/lib/src/main/java/com/rey/material/app/TimePickerDialog.java
@@ -9,10 +9,12 @@
 import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.format.DateUtils;
 import android.util.TypedValue;
+import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -23,7 +25,6 @@
 import com.rey.material.widget.TimePicker;
 
 import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
 /**
@@ -34,8 +35,18 @@ public class TimePickerDialog extends Dialog{
     private TimePickerLayout mTimePickerLayout;
     private float mCornerRadius;
 
+    /**
+     * Interface definition for a callback to be invoked when the selected time is changed.
+     */
     public interface OnTimeChangedListener{
 
+        /**
+         * Called when the selected time is changed.
+         * @param oldHour The hour value of old time.
+         * @param oldMinute The minute value of old time.
+         * @param newHour The hour value of new time.
+         * @param newMinute The minute value of new time.
+         */
         public void onTimeChanged(int oldHour, int oldMinute, int newHour, int newMinute);
 
     }
@@ -77,29 +88,54 @@ public Dialog cornerRadius(float radius){
         return super.cornerRadius(radius);
     }
 
+    /**
+     * Set the selected hour value.
+     * @param hour The selected hour value.
+     * @return The TimePickerDialog for chaining methods.
+     */
     public TimePickerDialog hour(int hour){
         mTimePickerLayout.setHour(hour);
         return this;
     }
 
+    /**
+     * Set the selected minute value.
+     * @param minute The selected minute value.
+     * @return The TimePickerDialog for chaining methods.
+     */
     public TimePickerDialog minute(int minute){
         mTimePickerLayout.setMinute(minute);
         return this;
     }
 
+    /**
+     * Set a listener will be called when the selected time is changed.
+     * @param listener The {@link TimePickerDialog.OnTimeChangedListener} will be called.
+     */
     public TimePickerDialog onTimeChangedListener(OnTimeChangedListener listener){
         mTimePickerLayout.setOnTimeChangedListener(listener);
         return this;
     }
 
+    /**
+     * @return The selected hour value.
+     */
     public int getHour(){
         return mTimePickerLayout.getHour();
     }
 
+    /**
+     * @return The selected minute value.
+     */
     public int getMinute(){
         return mTimePickerLayout.getMinute();
     }
 
+    /**
+     * Get the formatted string of selected time.
+     * @param formatter The DateFormat used to format the time.
+     * @return
+     */
     public String getFormattedTime(DateFormat formatter){
         return mTimePickerLayout.getFormattedTime(formatter);
     }
@@ -109,6 +145,7 @@ private class TimePickerLayout extends android.widget.FrameLayout implements Vie
         private int mHeaderHeight;
         private int mTextTimeColor;
         private int mTextTimeSize;
+        private boolean mIsLeadingZero;
 
         private boolean mIsAm = true;
         private int mCheckBoxSize;
@@ -127,6 +164,7 @@ private class TimePickerLayout extends android.widget.FrameLayout implements Vie
         private static final String TIME_DIVIDER = ":";
         private static final String BASE_TEXT = "0";
         private static final String FORMAT = "%02d";
+        private static final String FORMAT_NO_LEADING_ZERO = "%d";
 
         private boolean mLocationDirty = true;
         private float mBaseY;
@@ -156,9 +194,14 @@ public TimePickerLayout(Context context) {
             mPmView = new CircleCheckedTextView(context);
             mTimePicker = new TimePicker(context);
 
-            mTimePicker.set24Hour(isDefault24Hour());
             mTimePicker.setPadding(mContentPadding, mContentPadding, mContentPadding, mContentPadding);
             mTimePicker.setOnTimeChangedListener(this);
+            mAmView.setGravity(Gravity.CENTER);
+            mPmView.setGravity(Gravity.CENTER);
+            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1){
+                mAmView.setTextAlignment(TEXT_ALIGNMENT_CENTER);
+                mPmView.setTextAlignment(TEXT_ALIGNMENT_CENTER);
+            }
             mAmView.setCheckedImmediately(mIsAm);
             mPmView.setCheckedImmediately(!mIsAm);
             mAmView.setOnClickListener(this);
@@ -171,13 +214,6 @@ public TimePickerLayout(Context context) {
             setWillNotDraw(false);
         }
 
-        private boolean isDefault24Hour(){
-            SimpleDateFormat format = (SimpleDateFormat)SimpleDateFormat.getTimeInstance(SimpleDateFormat.FULL);
-            String pattern = format.toLocalizedPattern();
-
-            return pattern.indexOf("k") >= 0;
-        }
-
         public void applyStyle(int resId){
             mTimePicker.applyStyle(resId);
 
@@ -188,6 +224,7 @@ public void applyStyle(int resId){
             mHeaderHeight = a.getDimensionPixelSize(R.styleable.TimePickerDialog_tp_headerHeight, ThemeUtil.dpToPx(context, 120));
             mTextTimeColor = a.getColor(R.styleable.TimePickerDialog_tp_textTimeColor, 0xFF000000);
             mTextTimeSize = a.getDimensionPixelSize(R.styleable.TimePickerDialog_tp_textTimeSize, context.getResources().getDimensionPixelOffset(R.dimen.abc_text_size_headline_material));
+            mIsLeadingZero = a.getBoolean(R.styleable.TimePickerDialog_tp_leadingZero, false);
             String am = a.getString(R.styleable.TimePickerDialog_tp_am);
             String pm = a.getString(R.styleable.TimePickerDialog_tp_pm);
             a.recycle();
@@ -224,7 +261,7 @@ public void applyStyle(int resId){
 
             mPaint.setTypeface(mTimePicker.getTypeface());
 
-            mHour = String.format(FORMAT, !mTimePicker.is24Hour() && mTimePicker.getHour() == 0 ? 12 : mTimePicker.getHour());
+            mHour = String.format(mIsLeadingZero ? FORMAT : FORMAT_NO_LEADING_ZERO, !mTimePicker.is24Hour() && mTimePicker.getHour() == 0 ? 12 : mTimePicker.getHour());
             mMinute = String.format(FORMAT, mTimePicker.getMinute());
 
             if(!mTimePicker.is24Hour())
@@ -308,7 +345,7 @@ public void onModeChanged(int mode){
         public void onHourChanged(int oldValue, int newValue) {
             int oldHour = mTimePicker.is24Hour() || mIsAm ? oldValue : oldValue + 12;
 
-            mHour = String.format(FORMAT, !mTimePicker.is24Hour() && newValue == 0 ? 12 : newValue);
+            mHour = String.format(mIsLeadingZero ? FORMAT : FORMAT_NO_LEADING_ZERO, !mTimePicker.is24Hour() && newValue == 0 ? 12 : newValue);
             mLocationDirty = true;
             invalidate(0, 0, mHeaderRealWidth, mHeaderRealHeight);
 
diff --git a/lib/src/main/java/com/rey/material/app/ToolbarManager.java b/lib/src/main/java/com/rey/material/app/ToolbarManager.java
index b4f5a250..b6a7667a 100644
--- a/lib/src/main/java/com/rey/material/app/ToolbarManager.java
+++ b/lib/src/main/java/com/rey/material/app/ToolbarManager.java
@@ -17,6 +17,7 @@
 
 import com.rey.material.drawable.NavigationDrawerDrawable;
 import com.rey.material.drawable.ToolbarRippleDrawable;
+import com.rey.material.util.ViewUtil;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -40,8 +41,16 @@ public class ToolbarManager {
     private boolean mGroupChanged = false;
     private boolean mMenuDataChanged = true;
 
+    /**
+     * Interface definition for a callback to be invoked when the current group is changed.
+     */
     public interface OnToolbarGroupChangedListener {
 
+        /**
+         * Called when the current group changed.
+         * @param oldGroupId The id of old group.
+         * @param groupId The id of new group.
+         */
         public void onToolbarGroupChanged(int oldGroupId, int groupId);
 
     }
@@ -127,10 +136,17 @@ private void dispatchOnToolbarGroupChanged(int oldGroupId, int groupId){
         }
     }
 
+    /**
+     * @return The current group of the Toolbar.
+     */
     public int getCurrentGroup(){
         return mCurrentGroup;
     }
 
+    /**
+     * Set current group of the Toolbar.
+     * @param groupId The id of group.
+     */
     public void setCurrentGroup(int groupId){
         if(mCurrentGroup != groupId){
             int oldGroupId = mCurrentGroup;
@@ -203,6 +219,9 @@ public void notifyNavigationStateProgressChanged(boolean isBackState, float prog
             mNavigationManager.notifyStateProgressChanged(isBackState, progress);
     }
 
+    /**
+     * @return The navigation is in back state or not.
+     */
     public boolean isNavigationBackState(){
         return mNavigationManager != null && mNavigationManager.isBackState();
     }
@@ -235,15 +254,11 @@ private void onGlobalLayout() {
             mToolbar.getViewTreeObserver().removeGlobalOnLayoutListener(mOnGlobalLayoutListener);
 
         ActionMenuView menuView = getMenuView();
-
-        for(int i = 0; i < menuView.getChildCount(); i++){
+        for(int i = 0, count = menuView == null ? 0 : menuView.getChildCount(); i < count; i++){
             View child = menuView.getChildAt(i);
             if(mRippleStyle != 0){
                 if(child.getBackground() == null || !(child.getBackground() instanceof ToolbarRippleDrawable))
-                    if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
-                        child.setBackground(getBackground());
-                    else
-                        child.setBackgroundDrawable(getBackground());
+                    ViewUtil.setBackground(child, getBackground());
             }
         }
 
@@ -255,7 +270,7 @@ private void onGlobalLayout() {
 
     private void animateOut(){
         ActionMenuView menuView = getMenuView();
-        int count = menuView.getChildCount();
+        int count = menuView == null ? 0 : menuView.getChildCount();
         Animation slowestAnimation = null;
         mAnimations.clear();
         mAnimations.ensureCapacity(count);
@@ -287,7 +302,7 @@ private void animateOut(){
     private void animateIn(){
         ActionMenuView menuView = getMenuView();
 
-        for(int i = 0, count = menuView.getChildCount(); i < count; i++){
+        for(int i = 0, count = menuView == null ? 0 : menuView.getChildCount(); i < count; i++){
             View child = menuView.getChildAt(i);
             Animation anim = mAnimator.getInAnimation(child, i);
             if(anim != null)
@@ -295,10 +310,25 @@ private void animateIn(){
         }
     }
 
+    /**
+     * Interface definition for creating animation of menu item view when switch group.
+     */
     public interface Animator{
 
+        /**
+         * Get the animation of the menu item view will be removed.
+         * @param v The menu item view.
+         * @param position The position of item.
+         * @return
+         */
         public Animation getOutAnimation(View v, int position);
 
+        /**
+         * Get the animation of the menu item view will be added.
+         * @param v The menu item view.
+         * @param position The position of item.
+         * @return
+         */
         public Animation getInAnimation(View v, int position);
     }
 
@@ -313,15 +343,18 @@ public SimpleAnimator(int animIn, int animOut){
 
         @Override
         public Animation getOutAnimation(View v, int position) {
-            return AnimationUtils.loadAnimation(v.getContext(), mAnimationOut);
+            return mAnimationOut == 0 ? null : AnimationUtils.loadAnimation(v.getContext(), mAnimationOut);
         }
 
         @Override
         public Animation getInAnimation(View v, int position) {
-            return AnimationUtils.loadAnimation(v.getContext(), mAnimationIn);
+            return mAnimationIn == 0 ?  null : AnimationUtils.loadAnimation(v.getContext(), mAnimationIn);
         }
     }
 
+    /**
+     * Abstract class to manage the state of navigation icon.
+     */
     public static abstract class NavigationManager{
 
         protected NavigationDrawerDrawable mNavigationIcon;
diff --git a/lib/src/main/java/com/rey/material/drawable/CircularProgressDrawable.java b/lib/src/main/java/com/rey/material/drawable/CircularProgressDrawable.java
index 32fd7aee..9aafbd11 100644
--- a/lib/src/main/java/com/rey/material/drawable/CircularProgressDrawable.java
+++ b/lib/src/main/java/com/rey/material/drawable/CircularProgressDrawable.java
@@ -275,6 +275,13 @@ public int getProgressMode(){
 		return mProgressMode;
 	}
 
+    public void setProgressMode(int mode){
+        if(mProgressMode != mode) {
+            mProgressMode = mode;
+            invalidateSelf();
+        }
+    }
+
 	public float getProgress(){
 		return mProgressPercent;
 	}
diff --git a/lib/src/main/java/com/rey/material/drawable/ContactChipDrawable.java b/lib/src/main/java/com/rey/material/drawable/ContactChipDrawable.java
index 22d3d801..e735705e 100644
--- a/lib/src/main/java/com/rey/material/drawable/ContactChipDrawable.java
+++ b/lib/src/main/java/com/rey/material/drawable/ContactChipDrawable.java
@@ -16,6 +16,7 @@
 import android.text.Layout;
 import android.text.TextPaint;
 import android.text.TextUtils;
+import android.util.FloatMath;
 
 /**
  * Created by Rey on 1/21/2015.
@@ -46,6 +47,12 @@ public ContactChipDrawable(int paddingLeft, int paddingRight, Typeface typeface,
 
         mTextPaint = new TextPaint(mPaint);
         mMetrics = new BoringLayout.Metrics();
+        Paint.FontMetricsInt temp = mTextPaint.getFontMetricsInt();
+        mMetrics.ascent = temp.ascent;
+        mMetrics.bottom = temp.bottom;
+        mMetrics.descent = temp.descent;
+        mMetrics.top = temp.top;
+        mMetrics.leading = temp.leading;
 
         mRect = new RectF();
 
@@ -82,7 +89,7 @@ private void updateLayout(){
             return;
 
         int outerWidth = Math.max(0, bounds.width() - bounds.height() - mPaddingLeft - mPaddingRight);
-        mMetrics = BoringLayout.isBoring(mContactName, mTextPaint, mMetrics);
+        mMetrics.width = (int) FloatMath.ceil(mTextPaint.measureText(mContactName, 0, mContactName.length()));
 
         if(mBoringLayout == null)
             mBoringLayout = BoringLayout.make(mContactName, mTextPaint, outerWidth, Layout.Alignment.ALIGN_NORMAL, 1f, 1f, mMetrics, true, TextUtils.TruncateAt.END, outerWidth);
diff --git a/lib/src/main/java/com/rey/material/drawable/LineMorphingDrawable.java b/lib/src/main/java/com/rey/material/drawable/LineMorphingDrawable.java
index bb6a11f7..60bd8057 100644
--- a/lib/src/main/java/com/rey/material/drawable/LineMorphingDrawable.java
+++ b/lib/src/main/java/com/rey/material/drawable/LineMorphingDrawable.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import org.xmlpull.v1.XmlPullParser;
 
@@ -18,7 +19,10 @@
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.os.SystemClock;
+import android.support.v4.text.TextUtilsCompat;
+import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
+import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
@@ -51,12 +55,13 @@ public class LineMorphingDrawable extends Drawable implements Animatable{
 	private boolean mClockwise;
 	private Paint.Cap mStrokeCap;
 	private Paint.Join mStrokeJoin;
+    private boolean mIsRtl;
 	
 	private Path mPath;
 	
 	private State[] mStates;
 	
-	private LineMorphingDrawable(State[] states, int curState, int paddingLeft, int paddingTop, int paddingRight, int paddingBottom, int animDuration, Interpolator interpolator, int strokeSize, int strokeColor, Paint.Cap strokeCap, Paint.Join strokeJoin, boolean clockwise){
+	private LineMorphingDrawable(State[] states, int curState, int paddingLeft, int paddingTop, int paddingRight, int paddingBottom, int animDuration, Interpolator interpolator, int strokeSize, int strokeColor, Paint.Cap strokeCap, Paint.Join strokeJoin, boolean clockwise, boolean isRtl){
 		mStates = states;
 		mPaddingLeft = paddingLeft;
 		mPaddingTop = paddingTop;
@@ -69,7 +74,8 @@ private LineMorphingDrawable(State[] states, int curState, int paddingLeft, int
 		mStrokeColor = strokeColor;
 		mStrokeCap = strokeCap;
 		mStrokeJoin = strokeJoin;
-		mClockwise = clockwise;		
+		mClockwise = clockwise;
+        mIsRtl = isRtl;
 		
 		mPaint = new Paint();
 		mPaint.setAntiAlias(true);
@@ -90,7 +96,10 @@ private LineMorphingDrawable(State[] states, int curState, int paddingLeft, int
 	public void draw(Canvas canvas) {
 		int restoreCount = canvas.save();		
 		float degrees = (mClockwise ? 180 : -180) * ((mPrevState < mCurState ?  0f : 1f) + mAnimProgress);
-				
+
+        if(mIsRtl)
+            canvas.scale(-1f, 1f, mDrawBound.centerX(), mDrawBound.centerY());
+
 		canvas.rotate(degrees, mDrawBound.centerX(), mDrawBound.centerY());		
 		canvas.drawPath(mPath, mPaint);
 		canvas.restoreToCount(restoreCount);
@@ -390,6 +399,7 @@ public static class Builder{
 		private boolean mClockwise;
 		private Paint.Cap mStrokeCap;
 		private Paint.Join mStrokeJoin;
+        private boolean mIsRtl;
 		
 		private State[] mStates;
 		
@@ -437,6 +447,12 @@ else if(join == 1)
 			else
 				strokeJoin(Paint.Join.BEVEL);
 			clockwise(a.getBoolean(R.styleable.LineMorphingDrawable_lmd_clockwise, true));
+
+            int direction = a.getInteger(R.styleable.LineMorphingDrawable_lmd_layoutDirection, View.LAYOUT_DIRECTION_LTR);
+            if(direction == View.LAYOUT_DIRECTION_LOCALE)
+                rtl(TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) == ViewCompat.LAYOUT_DIRECTION_RTL);
+            else
+                rtl(direction == View.LAYOUT_DIRECTION_RTL);
 			
 			a.recycle();
 		}
@@ -563,7 +579,7 @@ public LineMorphingDrawable build(){
 			if(mInterpolator == null)
 				mInterpolator = new AccelerateInterpolator();
 							
-			return new LineMorphingDrawable(mStates, mCurState, mPaddingLeft, mPaddingTop, mPaddingRight, mPaddingBottom, mAnimDuration, mInterpolator, mStrokeSize, mStrokeColor, mStrokeCap, mStrokeJoin, mClockwise);
+			return new LineMorphingDrawable(mStates, mCurState, mPaddingLeft, mPaddingTop, mPaddingRight, mPaddingBottom, mAnimDuration, mInterpolator, mStrokeSize, mStrokeColor, mStrokeCap, mStrokeJoin, mClockwise, mIsRtl);
 		}
 		
 		public Builder states(State... states){			
@@ -638,6 +654,11 @@ public Builder clockwise(boolean clockwise){
 			mClockwise = clockwise;
 			return this;
 		}
+
+        public Builder rtl(boolean rtl){
+            mIsRtl = rtl;
+            return this;
+        }
 		
 	}
 }
diff --git a/lib/src/main/java/com/rey/material/drawable/LinearProgressDrawable.java b/lib/src/main/java/com/rey/material/drawable/LinearProgressDrawable.java
index 94fdd0ef..35793fc0 100644
--- a/lib/src/main/java/com/rey/material/drawable/LinearProgressDrawable.java
+++ b/lib/src/main/java/com/rey/material/drawable/LinearProgressDrawable.java
@@ -434,6 +434,13 @@ public int getProgressMode(){
 		return mProgressMode;
 	}
 
+    public void setProgressMode(int mode){
+        if(mProgressMode != mode) {
+            mProgressMode = mode;
+            invalidateSelf();
+        }
+    }
+
 	public float getProgress(){
 		return mProgressPercent;
 	}
diff --git a/lib/src/main/java/com/rey/material/drawable/RippleDrawable.java b/lib/src/main/java/com/rey/material/drawable/RippleDrawable.java
index a03da9c0..1f582eaa 100644
--- a/lib/src/main/java/com/rey/material/drawable/RippleDrawable.java
+++ b/lib/src/main/java/com/rey/material/drawable/RippleDrawable.java
@@ -16,7 +16,6 @@
 import android.graphics.RectF;
 import android.graphics.Shader;
 import android.graphics.drawable.Animatable;
-import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.SystemClock;
 import android.util.AttributeSet;
@@ -60,7 +59,7 @@ public class RippleDrawable extends Drawable implements Animatable,	OnTouchListe
 	private int mRippleAnimDuration;
 	private int mRippleColor;
 	private float mRippleAlphaPercent;
-	private boolean mDelayClick;
+	private int mDelayClickType;
 
 	private Interpolator mInInterpolator;
 	private Interpolator mOutInterpolator;
@@ -68,7 +67,11 @@ public class RippleDrawable extends Drawable implements Animatable,	OnTouchListe
 	private long mStartTime;	
 			
 	private int mState = STATE_OUT;
-	
+
+    public static final int DELAY_CLICK_NONE = 0;
+    public static final int DELAY_CLICK_UNTIL_RELEASE = 1;
+    public static final int DELAY_CLICK_AFTER_RELEASE = 2;
+
 	private static final int STATE_OUT = 0;
 	private static final int STATE_PRESS = 1;
 	private static final int STATE_HOVER = 2;
@@ -82,13 +85,13 @@ public class RippleDrawable extends Drawable implements Animatable,	OnTouchListe
 	private static final float[] GRADIENT_STOPS = new float[]{0f, 0.99f, 1f};
 	private static final float GRADIENT_RADIUS = 16;
 		
-	private RippleDrawable(Drawable backgroundDrawable, int backgroundAnimDuration, int backgroundColor, int rippleType, boolean delayClick,  int maxRippleRadius, int rippleAnimDuration, int rippleColor, Interpolator inInterpolator, Interpolator outInterpolator, int type, int topLeftCornerRadius, int topRightCornerRadius, int bottomRightCornerRadius, int bottomLeftCornerRadius, int left, int top, int right, int bottom){
+	private RippleDrawable(Drawable backgroundDrawable, int backgroundAnimDuration, int backgroundColor, int rippleType, int delayClickType,  int maxRippleRadius, int rippleAnimDuration, int rippleColor, Interpolator inInterpolator, Interpolator outInterpolator, int type, int topLeftCornerRadius, int topRightCornerRadius, int bottomRightCornerRadius, int bottomLeftCornerRadius, int left, int top, int right, int bottom){
 		setBackgroundDrawable(backgroundDrawable);
 		mBackgroundAnimDuration = backgroundAnimDuration;
 		mBackgroundColor = backgroundColor;
 		
 		mRippleType = rippleType;
-        setDelayClick(delayClick);
+        setDelayClickType(delayClickType);
 		mMaxRippleRadius = maxRippleRadius;
 		mRippleAnimDuration = rippleAnimDuration;
 		mRippleColor = rippleColor;
@@ -125,12 +128,12 @@ public void setBackgroundDrawable(Drawable backgroundDrawable){
             mBackgroundDrawable.setBounds(getBounds());
     }
 
-    public boolean isDelayClick(){
-        return mDelayClick;
+    public int getDelayClickType(){
+        return mDelayClickType;
     }
 
-    public void setDelayClick(boolean enable){
-        mDelayClick = enable;
+    public void setDelayClickType(int type){
+        mDelayClickType = type;
     }
 
     public void setMask(int type, int topLeftCornerRadius, int topRightCornerRadius, int bottomRightCornerRadius, int bottomLeftCornerRadius, int left, int top, int right, int bottom){
@@ -154,10 +157,20 @@ public int getOpacity() {
 	}
 		
 	public long getClickDelayTime(){
-		if(mState == STATE_RELEASE_ON_HOLD)			
-			return (mDelayClick ? 2 : 1) * Math.max(mBackgroundAnimDuration, mRippleAnimDuration) - (SystemClock.uptimeMillis() - mStartTime);
-		else if(mState == STATE_RELEASE)
-			return (mDelayClick ? Math.max(mBackgroundAnimDuration, mRippleAnimDuration) : 0) - (SystemClock.uptimeMillis() - mStartTime);
+        switch (mDelayClickType){
+            case DELAY_CLICK_NONE:
+                return -1;
+            case DELAY_CLICK_UNTIL_RELEASE:
+                if(mState == STATE_RELEASE_ON_HOLD)
+                    return Math.max(mBackgroundAnimDuration, mRippleAnimDuration) - (SystemClock.uptimeMillis() - mStartTime);
+                break;
+            case DELAY_CLICK_AFTER_RELEASE:
+                if(mState == STATE_RELEASE_ON_HOLD)
+                    return 2 * Math.max(mBackgroundAnimDuration, mRippleAnimDuration) - (SystemClock.uptimeMillis() - mStartTime);
+                else if(mState == STATE_RELEASE)
+                    return Math.max(mBackgroundAnimDuration, mRippleAnimDuration) - (SystemClock.uptimeMillis() - mStartTime);
+                break;
+        }
 		
 		return -1;
 	}
@@ -485,7 +498,7 @@ public static class Builder{
 		private int mMaxRippleRadius;
 		private int mRippleAnimDuration = 400;
 		private int mRippleColor;
-		private boolean mDelayClick;
+		private int mDelayClickType;
 
 		private Interpolator mInInterpolator;
 		private Interpolator mOutInterpolator;
@@ -513,7 +526,7 @@ public Builder(Context context, AttributeSet attrs, int defStyleAttr, int defSty
 			backgroundColor(a.getColor(R.styleable.RippleDrawable_rd_backgroundColor, 0));
 			backgroundAnimDuration(a.getInteger(R.styleable.RippleDrawable_rd_backgroundAnimDuration, context.getResources().getInteger(android.R.integer.config_mediumAnimTime)));
 			rippleType(a.getInteger(R.styleable.RippleDrawable_rd_rippleType, RippleDrawable.TYPE_TOUCH));
-            delayClick(a.getBoolean(R.styleable.RippleDrawable_rd_delayClick, false));
+            delayClickType(a.getInteger(R.styleable.RippleDrawable_rd_delayClick, RippleDrawable.DELAY_CLICK_NONE));
             type = ThemeUtil.getType(a, R.styleable.RippleDrawable_rd_maxRippleRadius);
             if(type >= TypedValue.TYPE_FIRST_INT && type <= TypedValue.TYPE_LAST_INT)
                 maxRippleRadius(a.getInteger(R.styleable.RippleDrawable_rd_maxRippleRadius, -1));
@@ -547,7 +560,7 @@ public RippleDrawable build(){
 			if(mOutInterpolator == null)
 				mOutInterpolator = new DecelerateInterpolator();
 			
-			return new RippleDrawable(mBackgroundDrawable, mBackgroundAnimDuration, mBackgroundColor, mRippleType, mDelayClick, mMaxRippleRadius, mRippleAnimDuration, mRippleColor, mInInterpolator, mOutInterpolator, mMaskType, mMaskTopLeftCornerRadius, mMaskTopRightCornerRadius, mMaskBottomRightCornerRadius, mMaskBottomLeftCornerRadius, mMaskLeft, mMaskTop, mMaskRight, mMaskBottom);
+			return new RippleDrawable(mBackgroundDrawable, mBackgroundAnimDuration, mBackgroundColor, mRippleType, mDelayClickType, mMaxRippleRadius, mRippleAnimDuration, mRippleColor, mInInterpolator, mOutInterpolator, mMaskType, mMaskTopLeftCornerRadius, mMaskTopRightCornerRadius, mMaskBottomRightCornerRadius, mMaskBottomLeftCornerRadius, mMaskLeft, mMaskTop, mMaskRight, mMaskBottom);
 		}
 		
 		public Builder backgroundDrawable(Drawable drawable){
@@ -570,8 +583,8 @@ public Builder rippleType(int type){
 			return this;
 		}
 
-        public Builder delayClick(boolean enable){
-            mDelayClick = enable;
+        public Builder delayClickType(int type){
+            mDelayClickType = type;
             return this;
         }
 
diff --git a/lib/src/main/java/com/rey/material/drawable/ToolbarRippleDrawable.java b/lib/src/main/java/com/rey/material/drawable/ToolbarRippleDrawable.java
index 3e6e3b67..bd549f80 100644
--- a/lib/src/main/java/com/rey/material/drawable/ToolbarRippleDrawable.java
+++ b/lib/src/main/java/com/rey/material/drawable/ToolbarRippleDrawable.java
@@ -19,6 +19,7 @@
 import android.graphics.drawable.Drawable;
 import android.os.SystemClock;
 import android.util.AttributeSet;
+import android.util.TypedValue;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.AnimationUtils;
 import android.view.animation.DecelerateInterpolator;
@@ -53,7 +54,7 @@ public class ToolbarRippleDrawable extends Drawable implements Animatable {
 	private int mRippleAnimDuration;
 	private int mRippleColor;
 	private float mRippleAlphaPercent;
-    private boolean mDelayClick;
+    private int mDelayClickType;
 			
 	private Interpolator mInInterpolator;
 	private Interpolator mOutInterpolator;
@@ -77,7 +78,7 @@ public class ToolbarRippleDrawable extends Drawable implements Animatable {
 	private static final float[] GRADIENT_STOPS = new float[]{0f, 0.99f, 1f};
 	private static final float GRADIENT_RADIUS = 16;
 		
-	private ToolbarRippleDrawable(int backgroundAnimDuration, int backgroundColor, int rippleType, boolean delayClick, int maxTouchRadius, int touchAnimDuration, int touchColor, Interpolator inInterpolator, Interpolator outInterpolator){
+	private ToolbarRippleDrawable(int backgroundAnimDuration, int backgroundColor, int rippleType, int delayClickType, int maxTouchRadius, int touchAnimDuration, int touchColor, Interpolator inInterpolator, Interpolator outInterpolator){
 		mBackgroundAnimDuration = backgroundAnimDuration;
 		mBackgroundColor = backgroundColor;
 		
@@ -85,7 +86,7 @@ private ToolbarRippleDrawable(int backgroundAnimDuration, int backgroundColor, i
 		mMaxRippleRadius = maxTouchRadius;
 		mRippleAnimDuration = touchAnimDuration;
 		mRippleColor = touchColor;
-        mDelayClick = delayClick;
+        mDelayClickType = delayClickType;
 
         if(mRippleType == TYPE_TOUCH && mMaxRippleRadius <= 0)
             mRippleType = TYPE_TOUCH_MATCH_VIEW;
@@ -111,12 +112,12 @@ private ToolbarRippleDrawable(int backgroundAnimDuration, int backgroundColor, i
 			mOutShader = new RadialGradient(0, 0, GRADIENT_RADIUS, new int[]{0, ColorUtil.getColor(mRippleColor, 0f), mRippleColor}, GRADIENT_STOPS, Shader.TileMode.CLAMP);
 	}
 
-    public boolean isDelayClick(){
-        return mDelayClick;
+    public int getDelayClickType(){
+        return mDelayClickType;
     }
 
-    public void setDelayClick(boolean enable){
-        mDelayClick = enable;
+    public void setDelayClickType(int type){
+        mDelayClickType = type;
     }
 
 	@Override
@@ -134,15 +135,25 @@ public void setColorFilter(ColorFilter filter) {
 	public int getOpacity() {
 		return PixelFormat.TRANSLUCENT;
 	}
-		
-	public long getClickDelayTime(){
-		if(mState == STATE_RELEASE_ON_HOLD)			
-			return (mDelayClick ? 2 : 1) * Math.max(mBackgroundAnimDuration, mRippleAnimDuration) - (SystemClock.uptimeMillis() - mStartTime);
-		else if(mState == STATE_RELEASE)
-			return (mDelayClick ? Math.max(mBackgroundAnimDuration, mRippleAnimDuration) : 0) - (SystemClock.uptimeMillis() - mStartTime);
-		
-		return -1;
-	}
+
+    public long getClickDelayTime(){
+        switch (mDelayClickType){
+            case RippleDrawable.DELAY_CLICK_NONE:
+                return -1;
+            case RippleDrawable.DELAY_CLICK_UNTIL_RELEASE:
+                if(mState == STATE_RELEASE_ON_HOLD)
+                    return Math.max(mBackgroundAnimDuration, mRippleAnimDuration) - (SystemClock.uptimeMillis() - mStartTime);
+                break;
+            case RippleDrawable.DELAY_CLICK_AFTER_RELEASE:
+                if(mState == STATE_RELEASE_ON_HOLD)
+                    return 2 * Math.max(mBackgroundAnimDuration, mRippleAnimDuration) - (SystemClock.uptimeMillis() - mStartTime);
+                else if(mState == STATE_RELEASE)
+                    return Math.max(mBackgroundAnimDuration, mRippleAnimDuration) - (SystemClock.uptimeMillis() - mStartTime);
+                break;
+        }
+
+        return -1;
+    }
 	
 	private void setRippleState(int state){
 		if(mState != state){
@@ -415,7 +426,7 @@ public static class Builder{
 		private int mMaxRippleRadius;
 		private int mRippleAnimDuration = 400;
 		private int mRippleColor;
-        private boolean mDelayClick;
+        private int mDelayClickType;
 		
 		private Interpolator mInInterpolator;
 		private Interpolator mOutInterpolator;
@@ -433,8 +444,12 @@ public Builder(Context context, AttributeSet attrs, int defStyleAttr, int defSty
 			backgroundColor(a.getColor(R.styleable.RippleDrawable_rd_backgroundColor, 0));
 			backgroundAnimDuration(a.getInteger(R.styleable.RippleDrawable_rd_backgroundAnimDuration, context.getResources().getInteger(android.R.integer.config_mediumAnimTime)));
 			rippleType(a.getInteger(R.styleable.RippleDrawable_rd_rippleType, ToolbarRippleDrawable.TYPE_TOUCH));
-            delayClick(a.getBoolean(R.styleable.RippleDrawable_rd_delayClick, false));
-			maxRippleRadius(a.getDimensionPixelSize(R.styleable.RippleDrawable_rd_maxRippleRadius, ThemeUtil.dpToPx(context, 48)));
+            delayClickType(a.getInteger(R.styleable.RippleDrawable_rd_delayClick, RippleDrawable.DELAY_CLICK_NONE));
+            int type = ThemeUtil.getType(a, R.styleable.RippleDrawable_rd_maxRippleRadius);
+            if(type >= TypedValue.TYPE_FIRST_INT && type <= TypedValue.TYPE_LAST_INT)
+                maxRippleRadius(a.getInteger(R.styleable.RippleDrawable_rd_maxRippleRadius, -1));
+            else
+			    maxRippleRadius(a.getDimensionPixelSize(R.styleable.RippleDrawable_rd_maxRippleRadius, ThemeUtil.dpToPx(context, 48)));
 			rippleColor(a.getColor(R.styleable.RippleDrawable_rd_rippleColor, ThemeUtil.colorControlHighlight(context, 0)));
 			rippleAnimDuration(a.getInteger(R.styleable.RippleDrawable_rd_rippleAnimDuration, context.getResources().getInteger(android.R.integer.config_mediumAnimTime)));
 			if((resId = a.getResourceId(R.styleable.RippleDrawable_rd_inInterpolator, 0)) != 0)
@@ -452,7 +467,7 @@ public ToolbarRippleDrawable build(){
 			if(mOutInterpolator == null)
 				mOutInterpolator = new DecelerateInterpolator();
 			
-			return new ToolbarRippleDrawable(mBackgroundAnimDuration, mBackgroundColor, mRippleType, mDelayClick, mMaxRippleRadius, mRippleAnimDuration, mRippleColor, mInInterpolator, mOutInterpolator);
+			return new ToolbarRippleDrawable(mBackgroundAnimDuration, mBackgroundColor, mRippleType, mDelayClickType, mMaxRippleRadius, mRippleAnimDuration, mRippleColor, mInInterpolator, mOutInterpolator);
 		}
 		
 		public Builder backgroundAnimDuration(int duration){
@@ -470,8 +485,8 @@ public Builder rippleType(int type){
 			return this;
 		}
 
-        public Builder delayClick(boolean enable){
-            mDelayClick = enable;
+        public Builder delayClickType(int type){
+            mDelayClickType = type;
             return this;
         }
 
diff --git a/lib/src/main/java/com/rey/material/text/style/ContactChipSpan.java b/lib/src/main/java/com/rey/material/text/style/ContactChipSpan.java
index 6af01509..72b54634 100644
--- a/lib/src/main/java/com/rey/material/text/style/ContactChipSpan.java
+++ b/lib/src/main/java/com/rey/material/text/style/ContactChipSpan.java
@@ -10,9 +10,11 @@
 import android.graphics.Typeface;
 import android.text.BoringLayout;
 import android.text.Layout;
+import android.text.StaticLayout;
 import android.text.TextPaint;
 import android.text.TextUtils;
 import android.text.style.ReplacementSpan;
+import android.util.FloatMath;
 
 /**
  * Created by Rey on 1/21/2015.
@@ -28,7 +30,6 @@ public class ContactChipSpan extends ReplacementSpan {
 
     private CharSequence mContactName;
     private BoringLayout mBoringLayout;
-    private BoringLayout.Metrics mMetrics;
     private TextPaint mTextPaint;
     private RectF mRect;
 
@@ -44,7 +45,7 @@ public ContactChipSpan(CharSequence name, int height, int maxWidth, int paddingL
         mPaint.setTextSize(textSize);
 
         mTextPaint = new TextPaint(mPaint);
-        mMetrics = new BoringLayout.Metrics();
+
 
         mRect = new RectF();
 
@@ -58,7 +59,14 @@ public ContactChipSpan(CharSequence name, int height, int maxWidth, int paddingL
         mWidth = Math.round(Math.min(maxWidth, mPaint.measureText(name, 0, name.length()) + paddingLeft + paddingRight + height));
 
         int outerWidth = Math.max(0, mWidth - mPaddingLeft - mPaddingRight - mHeight);
-        mMetrics = BoringLayout.isBoring(mContactName, mTextPaint, mMetrics);
+        Paint.FontMetricsInt temp = mTextPaint.getFontMetricsInt();
+        BoringLayout.Metrics mMetrics = new BoringLayout.Metrics();
+        mMetrics.width = (int)FloatMath.ceil(mTextPaint.measureText(mContactName, 0, mContactName.length()));
+        mMetrics.ascent = temp.ascent;
+        mMetrics.bottom = temp.bottom;
+        mMetrics.descent = temp.descent;
+        mMetrics.top = temp.top;
+        mMetrics.leading = temp.leading;
         mBoringLayout = BoringLayout.make(mContactName, mTextPaint, outerWidth, Layout.Alignment.ALIGN_NORMAL, 1f, 1f, mMetrics, true, TextUtils.TruncateAt.END, outerWidth);
     }
 
diff --git a/lib/src/main/java/com/rey/material/util/TypefaceUtil.java b/lib/src/main/java/com/rey/material/util/TypefaceUtil.java
index 120ec97f..3ba6fa5a 100644
--- a/lib/src/main/java/com/rey/material/util/TypefaceUtil.java
+++ b/lib/src/main/java/com/rey/material/util/TypefaceUtil.java
@@ -25,7 +25,7 @@ public static Typeface load(Context context, String familyName, int style) {
             synchronized (sCachedFonts) {
                 try {
                     if (!sCachedFonts.containsKey(familyName)) {
-                        final Typeface typeface = Typeface.createFromAsset(context.getAssets(), familyName);
+                        final Typeface typeface = Typeface.createFromAsset(context.getAssets(), familyName.substring(PREFIX_ASSET.length()));
                         sCachedFonts.put(familyName, typeface);
                         return typeface;
                     }
diff --git a/lib/src/main/java/com/rey/material/util/ViewUtil.java b/lib/src/main/java/com/rey/material/util/ViewUtil.java
index d891be76..c691f57e 100644
--- a/lib/src/main/java/com/rey/material/util/ViewUtil.java
+++ b/lib/src/main/java/com/rey/material/util/ViewUtil.java
@@ -3,6 +3,9 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import android.annotation.SuppressLint;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.view.View;
 
 public class ViewUtil {
 	
@@ -37,4 +40,11 @@ public static boolean hasState(int[] states, int state){
 		
 		return false;
 	}
+
+    public static void setBackground(View v, Drawable drawable){
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
+            v.setBackground(drawable);
+        else
+            v.setBackgroundDrawable(drawable);
+    }
 }
diff --git a/lib/src/main/java/com/rey/material/widget/CheckBox.java b/lib/src/main/java/com/rey/material/widget/CheckBox.java
index c19075b1..90fa9ea3 100644
--- a/lib/src/main/java/com/rey/material/widget/CheckBox.java
+++ b/lib/src/main/java/com/rey/material/widget/CheckBox.java
@@ -47,6 +47,10 @@ private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, i
         drawable.setAnimEnable(true);
     }
 
+    /**
+     * Change the checked state of this button immediately without showing animation.
+     * @param checked The checked state.
+     */
     public void setCheckedImmediately(boolean checked){
         if(mButtonDrawable instanceof CheckBoxDrawable){
             CheckBoxDrawable drawable = (CheckBoxDrawable)mButtonDrawable;
diff --git a/lib/src/main/java/com/rey/material/widget/CircleCheckedTextView.java b/lib/src/main/java/com/rey/material/widget/CircleCheckedTextView.java
index 84caf698..0b308506 100644
--- a/lib/src/main/java/com/rey/material/widget/CircleCheckedTextView.java
+++ b/lib/src/main/java/com/rey/material/widget/CircleCheckedTextView.java
@@ -7,6 +7,7 @@
 import android.view.animation.Interpolator;
 
 import com.rey.material.drawable.CircleDrawable;
+import com.rey.material.util.ViewUtil;
 
 /**
  * Created by Rey on 2/5/2015.
@@ -52,10 +53,7 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr, int def
         mBackground = new CircleDrawable();
         mBackground.setInEditMode(isInEditMode());
         mBackground.setAnimEnable(false);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
-            setBackground(mBackground);
-        else
-            setBackgroundDrawable(mBackground);
+        ViewUtil.setBackground(this, mBackground);
         mBackground.setAnimEnable(true);
     }
 
@@ -68,6 +66,10 @@ public void setBackgroundColor(int color) {
         mBackground.setColor(color);
     }
 
+    /**
+     * Set the duration of background's animation.
+     * @param duration The duration
+     */
     public void setAnimDuration(int duration) {
         mBackground.setAnimDuration(duration);
     }
diff --git a/lib/src/main/java/com/rey/material/widget/DatePicker.java b/lib/src/main/java/com/rey/material/widget/DatePicker.java
index 3a6233b4..dccfadda 100644
--- a/lib/src/main/java/com/rey/material/widget/DatePicker.java
+++ b/lib/src/main/java/com/rey/material/widget/DatePicker.java
@@ -59,13 +59,26 @@ public class DatePicker extends ListView implements AbsListView.OnScrollListener
     private int mMonthRealHeight;
 
     private Calendar mCalendar;
-    private boolean mIsMondayFirst;
+    private int mFirstDayOfWeek;
     private String[] mLabels = new String[7];
     private static String[] mDayTexts;
 
     private MonthAdapter mAdapter;
 
+    /**
+     * Interface definition for a callback to be invoked when the selected date is changed.
+     */
     public interface OnDateChangedListener {
+
+        /**
+         * Called when the selected date is changed.
+         * @param oldDay The day value of old date.
+         * @param oldMonth The month value of old date.
+         * @param oldYear The year value of old date.
+         * @param newDay The day value of new date.
+         * @param newMonth The month value of new date.
+         * @param newYear The year value of new date.
+         */
         public void onDateChanged(int oldDay, int oldMonth, int oldYear, int newDay, int newMonth, int newYear);
     }
 
@@ -88,6 +101,9 @@ public interface OnDateChangedListener {
     private int mPaddingRight;
     private int mPaddingBottom;
 
+    private static final String DAY_FORMAT = "%2d";
+    private static final String YEAR_FORMAT = "%4d";
+
     public DatePicker(Context context) {
         super(context);
 
@@ -131,7 +147,7 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr, int def
         mDayPadding = ThemeUtil.dpToPx(context, 4);
 
         mCalendar = Calendar.getInstance();
-        mIsMondayFirst = mCalendar.getFirstDayOfWeek() == Calendar.MONDAY;
+        mFirstDayOfWeek = mCalendar.getFirstDayOfWeek();
 
         int index = mCalendar.get(Calendar.DAY_OF_WEEK) - 1;
         DateFormat format = new SimpleDateFormat(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2 ? "EEEEE" : "E");
@@ -285,15 +301,29 @@ private String getDayText(int day){
         }
 
         if(mDayTexts[day - 1] == null)
-            mDayTexts[day - 1] = String.valueOf(day);
+            mDayTexts[day - 1] = String.format(DAY_FORMAT, day);
 
         return mDayTexts[day - 1];
     }
 
+    /**
+     * Set the range of selectable dates.
+     * @param minDay The day value of minimum date.
+     * @param minMonth The month value of minimum date.
+     * @param minYear The year value of minimum date.
+     * @param maxDay The day value of maximum date.
+     * @param maxMonth The month value of maximum date.
+     * @param maxYear The year value of maximum date.
+     */
     public void setDateRange(int minDay, int minMonth, int minYear, int maxDay, int maxMonth, int maxYear){
         mAdapter.setDateRange(minDay, minMonth, minYear, maxDay, maxMonth, maxYear);
     }
 
+    /**
+     * Jump to the view of a specific month.
+     * @param month
+     * @param year
+     */
     public void goTo(int month, int year){
         int position = mAdapter.positionOfMonth(month, year);
         postSetSelectionFromTop(position, 0);
@@ -309,6 +339,12 @@ public void run() {
         });
     }
 
+    /**
+     * Set the selected date of this DatePicker.
+     * @param day The day value of selected date.
+     * @param month The month value of selected date.
+     * @param year The year value of selected date.
+     */
     public void setDate(int day, int month, int year){
         if(mAdapter.getYear() == year && mAdapter.getMonth() == month && mAdapter.getDay() == day)
             return;
@@ -317,22 +353,40 @@ public void setDate(int day, int month, int year){
         goTo(month, year);
     }
 
+    /**
+     * Set the listener will be called when the selected date is changed.
+     * @param listener The {@link DatePicker.OnDateChangedListener} will be called.
+     */
     public void setOnDateChangedListener(OnDateChangedListener listener){
         mOnDateChangedListener = listener;
     }
 
+    /**
+     * @return The day value of selected date.
+     */
     public int getDay(){
         return mAdapter.getDay();
     }
 
+    /**
+     * @return The month value of selected date.
+     */
     public int getMonth(){
         return mAdapter.getMonth();
     }
 
+    /**
+     * @return The year value of selected date.
+     */
     public int getYear(){
         return mAdapter.getYear();
     }
 
+    /**
+     * Get the formatted string of selected date.
+     * @param formatter The DateFormat used to format the date.
+     * @return
+     */
     public String getFormattedDate(DateFormat formatter){
         mCalendar.set(Calendar.YEAR, mAdapter.getYear());
         mCalendar.set(Calendar.MONTH, mAdapter.getMonth());
@@ -487,10 +541,9 @@ private void calculateMonthView(){
             mCalendar.set(Calendar.YEAR, mYear);
 
             mMaxDay = mCalendar.getActualMaximum(Calendar.DAY_OF_MONTH);
-            mFirstDayCol = mCalendar.get(Calendar.DAY_OF_WEEK) - 1;
-            if(mIsMondayFirst)
-                mFirstDayCol = mFirstDayCol == 0 ? 6 : mFirstDayCol - 1;
-            mMonthText = mCalendar.getDisplayName(Calendar.MONTH, Calendar.LONG, Locale.getDefault()) + " " + mYear;
+            int dayOfWeek = mCalendar.get(Calendar.DAY_OF_WEEK);
+            mFirstDayCol = dayOfWeek < mFirstDayOfWeek ? dayOfWeek + 7 - mFirstDayOfWeek : dayOfWeek - mFirstDayOfWeek;
+            mMonthText = mCalendar.getDisplayName(Calendar.MONTH, Calendar.LONG, Locale.getDefault()) + " " + String.format(YEAR_FORMAT, mYear);
         }
 
         @Override
@@ -541,7 +594,7 @@ protected void onDraw(Canvas canvas) {
             for(int i = 0; i < 7; i++){
                 x = (i + 0.5f) * mDayWidth + paddingLeft;
                 y = paddingTop;
-                int index = mIsMondayFirst ? (i == 6 ? 0 : i + 1) : i;
+                int index = (i + mFirstDayOfWeek - 1) % 7;
                 canvas.drawText(mLabels[index], x, y, mPaint);
             }
 
@@ -592,20 +645,18 @@ public boolean onTouchEvent(MotionEvent event) {
             switch (event.getAction()){
                 case MotionEvent.ACTION_DOWN:
                     mTouchedDay = getTouchedDay(event.getX(), event.getY());
-                    if(mTouchedDay > 0)
-                        return true;
-                    break;
+                    return true;
                 case MotionEvent.ACTION_UP:
-                    if(getTouchedDay(event.getX(), event.getY()) == mTouchedDay)
+                    if(getTouchedDay(event.getX(), event.getY()) == mTouchedDay && mTouchedDay > 0) {
                         mAdapter.setDate(mTouchedDay, mMonth, mYear, true);
-                    mTouchedDay = -1;
+                        mTouchedDay = -1;
+                    }
                     return true;
                 case MotionEvent.ACTION_CANCEL:
                     mTouchedDay = -1;
-                    break;
+                    return true;
             }
-
-            return false;
+            return true;
         }
 
         private void resetAnimation(){
diff --git a/lib/src/main/java/com/rey/material/widget/EditText.java b/lib/src/main/java/com/rey/material/widget/EditText.java
index e6b1b54d..a3f1def1 100644
--- a/lib/src/main/java/com/rey/material/widget/EditText.java
+++ b/lib/src/main/java/com/rey/material/widget/EditText.java
@@ -56,12 +56,25 @@
 public class EditText extends FrameLayout {
 
 	private boolean mLabelEnable;
+    private boolean mLabelVisible;
 	private int mSupportMode;
     private int mAutoCompleteMode;
-	
+
+    /**
+     * Indicate this EditText should not show a support text.  
+     */
 	public static final int SUPPORT_MODE_NONE 					= 0;
+    /**
+     * Indicate this EditText should show a helper text, or error text if it's set. 
+     */
 	public static final int SUPPORT_MODE_HELPER 				= 1;
+    /**
+     * Indicate this EditText should show a helper text, along with error text if it's set.
+     */
 	public static final int SUPPORT_MODE_HELPER_WITH_ERROR 		= 2;
+    /**
+     * Indicate this EditText should show a char counter text.
+     */
 	public static final int SUPPORT_MODE_CHAR_COUNTER 			= 3;
 
     public static final int AUTOCOMPLETE_MODE_NONE 				= 0;
@@ -88,6 +101,8 @@ public class EditText extends FrameLayout {
 
     private TextView.OnSelectionChangedListener mOnSelectionChangedListener;
 
+    private boolean mIsRtl = false;
+
     public EditText(Context context) {
         super(context);
 
@@ -177,10 +192,7 @@ private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, i
         mDivider = new DividerDrawable(dividerHeight, mDividerCompoundPadding ? mInputView.getTotalPaddingLeft() : 0, mDividerCompoundPadding ? mInputView.getTotalPaddingRight() : 0, mDividerColors, dividerAnimDuration);
         mDivider.setInEditMode(isInEditMode());
         mDivider.setAnimEnable(false);
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
-            mInputView.setBackground(mDivider);
-        else
-            mInputView.setBackgroundDrawable(mDivider);
+        ViewUtil.setBackground(mInputView, mDivider);
         mDivider.setAnimEnable(true);
 
         if(text != null)
@@ -189,7 +201,10 @@ private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, i
         addView(mInputView, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
 
         if(mLabelEnable){
+            mLabelVisible = true;
             mLabelView = new LabelView(context);
+            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
+                mLabelView.setTextDirection(mIsRtl ? TEXT_DIRECTION_RTL : TEXT_DIRECTION_LTR);
             mLabelView.setGravity(GravityCompat.START);
             mLabelView.setSingleLine(true);
             int labelPadding = a.getDimensionPixelOffset(R.styleable.EditText_et_labelPadding, 0);
@@ -289,7 +304,26 @@ private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, i
 
         if(mLabelEnable){
             mLabelView.setText(mInputView.getHint());
-            mLabelView.setVisibility(TextUtils.isEmpty(mInputView.getText().toString()) ? View.INVISIBLE : View.VISIBLE);
+            setLabelVisible(!TextUtils.isEmpty(mInputView.getText().toString()), false);
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
+    @Override
+    public void onRtlPropertiesChanged(int layoutDirection) {
+        boolean rtl = layoutDirection == LAYOUT_DIRECTION_RTL;
+        if(mIsRtl != rtl) {
+            mIsRtl = rtl;
+
+            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1){
+                if(mLabelView != null)
+                    mLabelView.setTextDirection(mIsRtl ? TEXT_DIRECTION_RTL : TEXT_DIRECTION_LTR);
+
+                if(mSupportView != null)
+                    mSupportView.setTextDirection(mIsRtl ? TEXT_DIRECTION_RTL : TEXT_DIRECTION_LTR);
+            }
+
+            requestLayout();
         }
     }
 
@@ -385,15 +419,26 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
 		mInputView.layout(childLeft, childTop, childRight, childBottom);
 	}
 
+    /**
+     * Set the helper text of this EditText. Only work with support mode {@link #SUPPORT_MODE_HELPER} and {@link #SUPPORT_MODE_HELPER_WITH_ERROR}.
+     * @param helper The helper text.
+     */
 	public void setHelper(CharSequence helper){
 		mSupportHelper = helper;
 		setError(mSupportError);
 	}
-	
+
+    /**
+     * @return The helper text of this EditText.
+     */
 	public CharSequence getHelper(){
 		return mSupportHelper;
 	}
-	
+
+    /**
+     * Set the error text of this EditText. Only work with support mode {@link #SUPPORT_MODE_HELPER} and {@link #SUPPORT_MODE_HELPER_WITH_ERROR}.
+     * @param error The error text. Set null will clear the error.
+     */
 	public void setError(CharSequence error){
 		mSupportError = error;
 		
@@ -411,11 +456,17 @@ public void setError(CharSequence error){
 			mSupportView.setText(mSupportHelper);
 		}
 	}
-	
+
+    /**
+     * @return The error text of this EditText.
+     */
 	public CharSequence getError(){
 		return mSupportError;
 	}
-	
+
+    /**
+     * Clear the error text. Only work with support mode {@link #SUPPORT_MODE_HELPER} and {@link #SUPPORT_MODE_HELPER_WITH_ERROR}.
+     */
 	public void clearError(){
 		setError(null);
 	}
@@ -437,6 +488,65 @@ private void updateCharCounter(int count){
 		}
 	}
 
+    private void setLabelVisible(boolean visible, boolean animation){
+        if(!mLabelEnable|| mLabelVisible == visible)
+            return;
+
+        mLabelVisible = visible;
+
+        if(animation){
+            if(mLabelVisible){
+                if(mLabelInAnimId != 0){
+                    Animation anim = AnimationUtils.loadAnimation(getContext(), mLabelInAnimId);
+                    anim.setAnimationListener(new Animation.AnimationListener() {
+
+                        @Override
+                        public void onAnimationStart(Animation animation) {
+                            mLabelView.setVisibility(View.VISIBLE);
+                        }
+
+                        @Override
+                        public void onAnimationRepeat(Animation animation) {}
+
+                        @Override
+                        public void onAnimationEnd(Animation animation) {}
+                    });
+                    mLabelView.clearAnimation();
+                    mLabelView.startAnimation(anim);
+                }
+                else
+                    mLabelView.setVisibility(View.VISIBLE);
+            }
+            else{
+                if(mLabelOutAnimId != 0){
+                    Animation anim = AnimationUtils.loadAnimation(getContext(), mLabelOutAnimId);
+                    anim.setAnimationListener(new Animation.AnimationListener() {
+
+                        @Override
+                        public void onAnimationStart(Animation animation) {
+                            mLabelView.setVisibility(View.VISIBLE);
+                        }
+
+                        @Override
+                        public void onAnimationRepeat(Animation animation) {}
+
+                        @Override
+                        public void onAnimationEnd(Animation animation) {
+                            mLabelView.setVisibility(View.INVISIBLE);
+                        }
+
+                    });
+                    mLabelView.clearAnimation();
+                    mLabelView.startAnimation(anim);
+                }
+                else
+                    mLabelView.setVisibility(View.INVISIBLE);
+            }
+        }
+        else
+            mLabelView.setVisibility(mLabelVisible ? View.VISIBLE : View.INVISIBLE);
+    }
+
     /* protected method of AutoCompleteTextView */
 
     /**
@@ -530,7 +640,7 @@ protected void performFiltering(CharSequence text, int start, int end, int keyCo
      * <p>Sets the optional hint text that is displayed at the bottom of the
      * the matching list.  This can be used as a cue to the user on how to
      * best use the list, or to provide extra information.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @param hint the text to be displayed to the user
      *
@@ -546,7 +656,7 @@ public void setCompletionHint(CharSequence hint) {
 
     /**
      * Gets the optional hint text displayed at the bottom of the the matching list.
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @return The hint text, if any
      *
@@ -564,7 +674,7 @@ public CharSequence getCompletionHint() {
      * <p>Returns the current width for the auto-complete drop down list. This can
      * be a fixed width, or {@link ViewGroup.LayoutParams#MATCH_PARENT} to fill the screen, or
      * {@link ViewGroup.LayoutParams#WRAP_CONTENT} to fit the width of its anchor view.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @return the width for the drop down list
      *
@@ -580,7 +690,7 @@ public int getDropDownWidth() {
      * <p>Sets the current width for the auto-complete drop down list. This can
      * be a fixed width, or {@link ViewGroup.LayoutParams#MATCH_PARENT} to fill the screen, or
      * {@link ViewGroup.LayoutParams#WRAP_CONTENT} to fit the width of its anchor view.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @param width the width to use
      *
@@ -597,7 +707,7 @@ public void setDropDownWidth(int width) {
      * be a fixed height, or {@link ViewGroup.LayoutParams#MATCH_PARENT} to fill
      * the screen, or {@link ViewGroup.LayoutParams#WRAP_CONTENT} to fit the height
      * of the drop down's content.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @return the height for the drop down list
      *
@@ -614,7 +724,7 @@ public int getDropDownHeight() {
      * be a fixed height, or {@link ViewGroup.LayoutParams#MATCH_PARENT} to fill
      * the screen, or {@link ViewGroup.LayoutParams#WRAP_CONTENT} to fit the height
      * of the drop down's content.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @param height the height to use
      *
@@ -628,7 +738,7 @@ public void setDropDownHeight(int height) {
 
     /**
      * <p>Returns the id for the view that the auto-complete drop down list is anchored to.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @return the view's id, or {@link View#NO_ID} if none specified
      *
@@ -644,7 +754,7 @@ public int getDropDownAnchor() {
      * <p>Sets the view to which the auto-complete drop down list should anchor. The view
      * corresponding to this id will not be loaded until the next time it is needed to avoid
      * loading a view which is not yet instantiated.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @param id the id to anchor the drop down list view to
      *
@@ -658,7 +768,7 @@ public void setDropDownAnchor(int id) {
 
     /**
      * <p>Gets the background of the auto-complete drop-down list.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @return the background drawable
      *
@@ -672,7 +782,7 @@ public Drawable getDropDownBackground() {
 
     /**
      * <p>Sets the background of the auto-complete drop-down list.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @param d the drawable to set as the background
      *
@@ -686,7 +796,7 @@ public void setDropDownBackgroundDrawable(Drawable d) {
 
     /**
      * <p>Sets the background of the auto-complete drop-down list.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @param id the id of the drawable to set as the background
      *
@@ -700,7 +810,7 @@ public void setDropDownBackgroundResource(int id) {
 
     /**
      * <p>Sets the vertical offset used for the auto-complete drop-down list.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @param offset the vertical offset
      *
@@ -714,7 +824,7 @@ public void setDropDownVerticalOffset(int offset) {
 
     /**
      * <p>Gets the vertical offset used for the auto-complete drop-down list.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @return the vertical offset
      *
@@ -728,7 +838,7 @@ public int getDropDownVerticalOffset() {
 
     /**
      * <p>Sets the horizontal offset used for the auto-complete drop-down list.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @param offset the horizontal offset
      *
@@ -742,7 +852,7 @@ public void setDropDownHorizontalOffset(int offset) {
 
     /**
      * <p>Gets the horizontal offset used for the auto-complete drop-down list.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @return the horizontal offset
      *
@@ -757,7 +867,7 @@ public int getDropDownHorizontalOffset() {
     /**
      * <p>Returns the number of characters the user must type before the drop
      * down list is shown.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @return the minimum number of characters to type to show the drop down
      *
@@ -778,7 +888,7 @@ public int getThreshold() {
      * <p>When <code>threshold</code> is less than or equals 0, a threshold of
      * 1 is applied.</p>
      *
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @param threshold the number of characters to type before the drop down
      *                  is shown
@@ -796,7 +906,7 @@ public void setThreshold(int threshold) {
     /**
      * <p>Sets the listener that will be notified when the user clicks an item
      * in the drop down list.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @param l the item click listener
      */
@@ -809,7 +919,7 @@ public void setOnItemClickListener(AdapterView.OnItemClickListener l) {
     /**
      * <p>Sets the listener that will be notified when the user selects an item
      * in the drop down list.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @param l the item selected listener
      */
@@ -822,7 +932,7 @@ public void setOnItemSelectedListener(AdapterView.OnItemSelectedListener l) {
     /**
      * <p>Returns the listener that is notified whenever the user clicks an item
      * in the drop down list.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @return the item click listener
      */
@@ -835,7 +945,7 @@ public AdapterView.OnItemClickListener getOnItemClickListener() {
     /**
      * <p>Returns the listener that is notified whenever the user selects an
      * item in the drop down list.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @return the item selected listener
      */
@@ -847,7 +957,7 @@ public AdapterView.OnItemSelectedListener getOnItemSelectedListener() {
 
     /**
      * <p>Returns a filterable list adapter used for auto completion.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @return a data adapter used for auto completion
      */
@@ -870,7 +980,7 @@ public ListAdapter getAdapter() {
      * startManagingCursor()}),
      * or by manually closing the cursor when the AutoCompleteTextView is dismissed.</p>
      *
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @param adapter the adapter holding the auto completion data
      *
@@ -889,7 +999,7 @@ public <T extends ListAdapter & Filterable> void setAdapter(T adapter) {
      * or exceeds the {@link #getThreshold} requirement.  You can override
      * this to impose a different standard for when filtering will be
      * triggered.
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      */
     public boolean enoughToFilter() {
         if(mAutoCompleteMode == AUTOCOMPLETE_MODE_NONE)
@@ -899,7 +1009,7 @@ public boolean enoughToFilter() {
 
     /**
      * <p>Indicates whether the popup menu is showing.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @return true if the popup menu is showing, false otherwise
      */
@@ -912,7 +1022,7 @@ public boolean isPopupShowing() {
     /**
      * <p>Clear the list selection.  This may only be temporary, as user input will often bring
      * it back.
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      */
     public void clearListSelection() {
         if(mAutoCompleteMode == AUTOCOMPLETE_MODE_NONE)
@@ -922,7 +1032,7 @@ public void clearListSelection() {
 
     /**
      * Set the position of the dropdown view selection.
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @param position The position to move the selector to.
      */
@@ -936,7 +1046,7 @@ public void setListSelection(int position) {
      * Get the position of the dropdown view selection, if there is one.  Returns
      * {@link android.widget.ListView#INVALID_POSITION ListView.INVALID_POSITION} if there is no dropdown or if
      * there is no selection.
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @return the position of the current selection, if there is one, or
      * {@link android.widget.ListView#INVALID_POSITION ListView.INVALID_POSITION} if not.
@@ -953,7 +1063,7 @@ public int getListSelection() {
      * <p>Performs the text completion by converting the selected item from
      * the drop down list into a string, replacing the text box's content with
      * this string and finally dismissing the drop down menu.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      */
     public void performCompletion() {
         if(mAutoCompleteMode == AUTOCOMPLETE_MODE_NONE)
@@ -964,7 +1074,7 @@ public void performCompletion() {
     /**
      * Identifies whether the view is currently performing a text completion, so subclasses
      * can decide whether to respond to text changed events.
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      */
     public boolean isPerformingCompletion() {
         if(mAutoCompleteMode == AUTOCOMPLETE_MODE_NONE)
@@ -972,7 +1082,7 @@ public boolean isPerformingCompletion() {
         return ((AutoCompleteTextView)mInputView).isPerformingCompletion();
     }
 
-    /** <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p> */
+    /** <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p> */
     public void onFilterComplete(int count) {
         if(mAutoCompleteMode == AUTOCOMPLETE_MODE_SINGLE)
             ((InternalAutoCompleteTextView)mInputView).superOnFilterComplete(count);
@@ -982,7 +1092,7 @@ else if(mAutoCompleteMode == AUTOCOMPLETE_MODE_MULTI)
 
     /**
      * <p>Closes the drop down if present on screen.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      */
     public void dismissDropDown() {
         if(mAutoCompleteMode == AUTOCOMPLETE_MODE_NONE)
@@ -992,7 +1102,7 @@ public void dismissDropDown() {
 
     /**
      * <p>Displays the drop down on screen.</p>
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      */
     public void showDropDown() {
         if(mAutoCompleteMode == AUTOCOMPLETE_MODE_NONE)
@@ -1002,7 +1112,7 @@ public void showDropDown() {
 
     /**
      * Sets the validator used to perform text validation.
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @param validator The validator used to validate the text entered in this widget.
      *
@@ -1018,7 +1128,7 @@ public void setValidator(AutoCompleteTextView.Validator validator) {
     /**
      * Returns the Validator set with {@link #setValidator},
      * or <code>null</code> if it was not set.
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @see #setValidator(android.widget.AutoCompleteTextView.Validator)
      * @see #performValidation()
@@ -1032,7 +1142,7 @@ public AutoCompleteTextView.Validator getValidator() {
     /**
      * If a validator was set on this view and the current string is not valid,
      * ask the validator to fix it.
-     * <p>Only work when autoCompleMode is AUTOCOMPLETE_MODE_SINGLE or AUTOCOMPLETE_MODE_MULTI</p>
+     * <p>Only work when autoComplete mode is {@link #AUTOCOMPLETE_MODE_SINGLE} or {@link #AUTOCOMPLETE_MODE_MULTI}</p>
      *
      * @see #getValidator()
      * @see #setValidator(android.widget.AutoCompleteTextView.Validator)
@@ -1071,11 +1181,28 @@ public void extendSelection (int index){
 	public Editable getText (){
 		return mInputView.getText();
 	}
-	
+
+    /**
+     * Convenience for {@link android.text.Selection#selectAll}.
+     */
 	public void selectAll (){
 		mInputView.selectAll();
 	}
-	
+
+    /**
+     * Causes words in the text that are longer than the view is wide
+     * to be ellipsized instead of broken in the middle.  You may also
+     * want to {@link #setSingleLine} or {@link #setHorizontallyScrolling}
+     * to constrain the text to a single line.  Use <code>null</code>
+     * to turn off ellipsizing.
+     *
+     * If {@link #setMaxLines} has been used to set two or more lines,
+     * only {@link android.text.TextUtils.TruncateAt#END} and
+     * {@link android.text.TextUtils.TruncateAt#MARQUEE} are supported
+     * (other ellipsizing types will not do anything).
+     *
+     * @attr ref android.R.styleable#TextView_ellipsize
+     */
 	public void setEllipsize (TruncateAt ellipsis){
 		mInputView.setEllipsize(ellipsis);
 	}
@@ -3366,63 +3493,10 @@ public boolean canPaste() {
 	private class InputTextWatcher implements TextWatcher {
         @Override
         public void afterTextChanged(Editable s) {
-        	if(!mLabelEnable)
-        		return;
-        	
         	int count = s.length();
-        	
-            if(count == 0){
-            	if(mLabelView.getVisibility() == View.VISIBLE){
-            		if(mLabelOutAnimId > 0){
-                		Animation anim = AnimationUtils.loadAnimation(getContext(), mLabelOutAnimId);
-                		anim.setAnimationListener(new Animation.AnimationListener() {
-    						
-    						@Override
-    						public void onAnimationStart(Animation animation) {}
-    						
-    						@Override
-    						public void onAnimationRepeat(Animation animation) {}
-    						
-    						@Override
-    						public void onAnimationEnd(Animation animation) {
-    							mLabelView.setVisibility(View.INVISIBLE);							
-    						}
-    						
-    					});
-                		mLabelView.startAnimation(anim);
-                	}
-                	else
-                		mLabelView.setVisibility(View.INVISIBLE);
-            	}    
-            	
-            	if(mSupportMode == SUPPORT_MODE_CHAR_COUNTER)
-            		updateCharCounter(count);       	
-            } else{
-            	if(mLabelView.getVisibility() == View.INVISIBLE){
-            		if(mLabelInAnimId > 0){
-                		Animation anim = AnimationUtils.loadAnimation(getContext(), mLabelInAnimId);
-                		anim.setAnimationListener(new Animation.AnimationListener() {
-    						
-    						@Override
-    						public void onAnimationStart(Animation animation) {
-    							mLabelView.setVisibility(View.VISIBLE);
-    						}
-    						
-    						@Override
-    						public void onAnimationRepeat(Animation animation) {}
-    						
-    						@Override
-    						public void onAnimationEnd(Animation animation) {}
-    					});
-                		mLabelView.startAnimation(anim);            	
-                	}
-                	else
-                		mLabelView.setVisibility(View.VISIBLE);
-            	}     
-            	
-            	if(mSupportMode == SUPPORT_MODE_CHAR_COUNTER)
-            		updateCharCounter(count);
-            }
+        	setLabelVisible(count != 0, true);
+            if(mSupportMode == SUPPORT_MODE_CHAR_COUNTER)
+                updateCharCounter(count);
         }
 
         @Override
diff --git a/lib/src/main/java/com/rey/material/widget/FloatingActionButton.java b/lib/src/main/java/com/rey/material/widget/FloatingActionButton.java
index 6c36cdd6..821fc862 100644
--- a/lib/src/main/java/com/rey/material/widget/FloatingActionButton.java
+++ b/lib/src/main/java/com/rey/material/widget/FloatingActionButton.java
@@ -122,11 +122,18 @@ else if(iconSrc != 0)
 
         setClickable(true);
     }
-	
+
+    /**
+     * @return The radius of the button.
+     */
 	public int getRadius(){
 		return mBackground.getRadius();
 	}
-	
+
+    /**
+     * Set radius of the button.
+     * @param radius The radius in pixel.
+     */
 	public void setRadius(int radius){
 		if(mBackground.setRadius(radius))
 			requestLayout();
@@ -149,27 +156,46 @@ public void setElevation(float elevation) {
 		else if(mBackground.setShadow(elevation, elevation))
 			requestLayout();
 	}
-	
+
+    /**
+     * @return The line state of LineMorphingDrawable that is used as this button's icon.
+     */
 	public int getLineMorphingState(){
 		if(mIcon != null && mIcon instanceof LineMorphingDrawable)
 			return ((LineMorphingDrawable)mIcon).getLineState();
 		
 		return -1;
 	}
-	
+
+    /**
+     * Set the line state of LineMorphingDrawable that is used as this button's icon.
+     * @param state The line state.
+     * @param animation Indicate should show animation when switch line state or not.
+     */
 	public void setLineMorphingState(int state, boolean animation){
 		if(mIcon != null && mIcon instanceof LineMorphingDrawable)
             ((LineMorphingDrawable)mIcon).switchLineState(state, animation);
 	}
-	
+
+    /**
+     * @return The background color of this button.
+     */
 	public int getBackgroundColor(){
 		return mBackground.getColor();
 	}
-	
+
+    /**
+     * @return The drawable is used as this button's icon.
+     */
 	public Drawable getIcon(){
 		return mIcon;
 	}
-	
+
+    /**
+     * Set the drawable that is used as this button's icon.
+     * @param icon The drawable.
+     * @param animation Indicate should show animation when switch drawable or not.
+     */
 	public void setIcon(Drawable icon, boolean animation){
         if(icon == null)
             return;
@@ -197,18 +223,38 @@ public void setBackgroundColor(int color){
 		mBackground.setColor(color);
         invalidate();
 	}
-		
+
+    /**
+     * Show this button at the specific location. If this button isn't attached to any parent view yet,
+     * it will be add to activity's root view. If not, it will just update the location.
+     * @param activity The activity that this button will be attached to.
+     * @param x The x value of anchor point.
+     * @param y The y value of anchor point.
+     * @param gravity The gravity apply with this button.
+     *
+     * @see android.view.Gravity
+     */
 	public void show(Activity activity, int x, int y, int gravity){		
 		if(getParent() == null){						
 			FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(mBackground.getIntrinsicWidth(), mBackground.getIntrinsicHeight());
-			updateParams(x, y, gravity, params);	
-			
+			updateParams(x, y, gravity, params);
+
 			activity.getWindow().addContentView(this, params);
 		}
 		else
 			updateLocation(x, y, gravity);
 	}
-	
+
+    /**
+     * Show this button at the specific location. If this button isn't attached to any parent view yet,
+     * it will be add to activity's root view. If not, it will just update the location.
+     * @param parent The parent view. Should be {@link android.widget.FrameLayout} or {@link android.widget.RelativeLayout}
+     * @param x The x value of anchor point.
+     * @param y The y value of anchor point.
+     * @param gravity The gravity apply with this button.
+     *
+     * @see android.view.Gravity
+     */
 	public void show(ViewGroup parent, int x, int y, int gravity){		
 		if(getParent() == null){						
 			ViewGroup.LayoutParams params = parent.generateLayoutParams(null);
@@ -221,7 +267,15 @@ public void show(ViewGroup parent, int x, int y, int gravity){
 		else
 			updateLocation(x, y, gravity);
 	}
-	
+
+    /**
+     * Update the location of this button. This method only work if it's already attached to a parent view.
+     * @param x The x value of anchor point.
+     * @param y The y value of anchor point.
+     * @param gravity The gravity apply with this button.
+     *
+     * @see android.view.Gravity
+     */
 	public void updateLocation(int x, int y, int gravity){
 		if(getParent() != null)
 			updateParams(x, y, gravity, getLayoutParams());
@@ -284,7 +338,10 @@ else if(params instanceof RelativeLayout.LayoutParams)
         else
             Log.v(FloatingActionButton.class.getSimpleName(), "cannot recognize LayoutParams: " + params);
 	}
-	
+
+    /**
+     * Remove this button from parent view.
+     */
 	public void dismiss(){
 		if(getParent() != null)
 			((ViewGroup)getParent()).removeView(this);		
diff --git a/lib/src/main/java/com/rey/material/widget/ListPopupWindow.java b/lib/src/main/java/com/rey/material/widget/ListPopupWindow.java
index 022b2911..9710965c 100644
--- a/lib/src/main/java/com/rey/material/widget/ListPopupWindow.java
+++ b/lib/src/main/java/com/rey/material/widget/ListPopupWindow.java
@@ -54,11 +54,9 @@
 import com.rey.material.R;
 
 /**
- * Static library support version of the framework's {@link android.widget.ListPopupWindow}.
- * Used to write apps that run on platforms prior to Android L. When running
- * on Android L or above, this implementation is still used; it does not try
- * to switch to the framework's implementation. See the framework SDK
- * documentation for a class overview.
+ * This is a copy of android.support.v7.widget.ListPopupWindow.
+ * Just change DropDownListView's parent class to com.rey.material.widget.ListView to support
+ * RippleEffect in child view.
  *
  * @see android.widget.ListPopupWindow
  */
diff --git a/lib/src/main/java/com/rey/material/widget/ProgressView.java b/lib/src/main/java/com/rey/material/widget/ProgressView.java
index f8b8a63c..29ef7aff 100644
--- a/lib/src/main/java/com/rey/material/widget/ProgressView.java
+++ b/lib/src/main/java/com/rey/material/widget/ProgressView.java
@@ -12,6 +12,7 @@
 import com.rey.material.R;
 import com.rey.material.drawable.CircularProgressDrawable;
 import com.rey.material.drawable.LinearProgressDrawable;
+import com.rey.material.util.ViewUtil;
 
 public class ProgressView extends View {
 
@@ -61,41 +62,39 @@ private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, i
         mCircular = a.getBoolean(R.styleable.ProgressView_pv_circular, true);
         mProgressId = a.getResourceId(R.styleable.ProgressView_pv_progressStyle, 0);
 
-        a.recycle();
-
         if(mProgressId == 0)
             mProgressId = mCircular ? R.style.Material_Drawable_CircularProgress : R.style.Material_Drawable_LinearProgress;
 
-        if(mCircular)
+        if(mCircular) {
             mProgressDrawable = new CircularProgressDrawable.Builder(context, mProgressId).build();
-        else
+            if(a.hasValue(R.styleable.ProgressView_pv_progressMode))
+                ((CircularProgressDrawable)mProgressDrawable).setProgressMode(a.getInt(R.styleable.ProgressView_pv_progressMode, MODE_INDETERMINATE));
+        }
+        else{
             mProgressDrawable = new LinearProgressDrawable.Builder(context, mProgressId).build();
-
-        if(android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN)
-            setBackground(mProgressDrawable);
-        else
-            setBackgroundDrawable(mProgressDrawable);
-    }
-	
-	@Override
-    public void setVisibility(int v) {
-        if(getVisibility() != v) {
-            super.setVisibility(v);
-
-            if (getProgressMode() == MODE_INDETERMINATE && mAutostart) {
-                if (v == GONE || v == INVISIBLE)
-                	stop();
-                else
-                	start();
-            }
+            if(a.hasValue(R.styleable.ProgressView_pv_progressMode))
+                ((LinearProgressDrawable)mProgressDrawable).setProgressMode(a.getInt(R.styleable.ProgressView_pv_progressMode, MODE_INDETERMINATE));
         }
+
+        if(a.hasValue(R.styleable.ProgressView_pv_progress))
+            setProgress(a.getFloat(R.styleable.ProgressView_pv_progress, 0));
+
+        if(a.hasValue(R.styleable.ProgressView_pv_secondaryProgress))
+            setSecondaryProgress(a.getFloat(R.styleable.ProgressView_pv_secondaryProgress, 0));
+
+        a.recycle();
+
+        ViewUtil.setBackground(this, mProgressDrawable);
     }
-	
+
 	@Override
 	protected void onVisibilityChanged(@NonNull View changedView, int visibility) {
 		super.onVisibilityChanged(changedView, visibility);
 
-	    if (getProgressMode() == MODE_INDETERMINATE && mAutostart) {
+        if(changedView != this)
+            return;
+
+	    if (mAutostart) {
 	    	if (visibility == GONE || visibility == INVISIBLE)
 	    		stop();
             else
@@ -106,58 +105,78 @@ protected void onVisibilityChanged(@NonNull View changedView, int visibility) {
 	@Override
 	protected void onAttachedToWindow() {
 		super.onAttachedToWindow();
-	    if (getProgressMode() == MODE_INDETERMINATE && mAutostart) 
+        if(getVisibility() == View.VISIBLE && mAutostart)
 	    	start();
 	}
 
 	@Override
 	protected void onDetachedFromWindow() {
-		if (getProgressMode() == MODE_INDETERMINATE && mAutostart) 
+		if (mAutostart)
 	    	stop();
 		
 	    super.onDetachedFromWindow();
 	}
-	 
+
 	public int getProgressMode(){
 		if(mCircular)
 			return ((CircularProgressDrawable)mProgressDrawable).getProgressMode();
 		else
 			return ((LinearProgressDrawable)mProgressDrawable).getProgressMode();
 	}
-	
+
+    /**
+     * @return The current progress of this view in [0..1] range.
+     */
 	public float getProgress(){
 		if(mCircular)
 			return ((CircularProgressDrawable)mProgressDrawable).getProgress();
 		else
 			return ((LinearProgressDrawable)mProgressDrawable).getProgress();
 	}
-	
+
+    /**
+     * @return The current secondary progress of this view in [0..1] range.
+     */
 	public float getSecondaryProgress(){
 		if(mCircular)
 			return ((CircularProgressDrawable)mProgressDrawable).getSecondaryProgress();
 		else
 			return ((LinearProgressDrawable)mProgressDrawable).getSecondaryProgress();
 	}
-	
+
+    /**
+     * Set the current progress of this view.
+     * @param percent The progress value in [0..1] range.
+     */
 	public void setProgress(float percent){
 		if(mCircular)
 			((CircularProgressDrawable)mProgressDrawable).setProgress(percent);
 		else
 			((LinearProgressDrawable)mProgressDrawable).setProgress(percent);
 	}
-	
+
+    /**
+     * Set the current secondary progress of this view.
+     * @param percent The progress value in [0..1] range.
+     */
 	public void setSecondaryProgress(float percent){
 		if(mCircular)
 			((CircularProgressDrawable)mProgressDrawable).setSecondaryProgress(percent);
 		else
 			((LinearProgressDrawable)mProgressDrawable).setSecondaryProgress(percent);
 	}
-	
+
+    /**
+     * Start showing progress.
+     */
 	public void start(){
 		if(mProgressDrawable != null)
 			((Animatable)mProgressDrawable).start();
 	}
-	
+
+    /**
+     * Stop showing progress.
+     */
 	public void stop(){
 		if(mProgressDrawable != null)
 			((Animatable)mProgressDrawable).stop();
diff --git a/lib/src/main/java/com/rey/material/widget/RadioButton.java b/lib/src/main/java/com/rey/material/widget/RadioButton.java
index edd927d3..6ca00d28 100644
--- a/lib/src/main/java/com/rey/material/widget/RadioButton.java
+++ b/lib/src/main/java/com/rey/material/widget/RadioButton.java
@@ -57,6 +57,10 @@ public void toggle() {
         }
     }
 
+    /**
+     * Change the checked state of this button immediately without showing animation.
+     * @param checked The checked state.
+     */
     public void setCheckedImmediately(boolean checked){
         if(mButtonDrawable instanceof RadioButtonDrawable){
             RadioButtonDrawable drawable = (RadioButtonDrawable)mButtonDrawable;
diff --git a/lib/src/main/java/com/rey/material/widget/RippleManager.java b/lib/src/main/java/com/rey/material/widget/RippleManager.java
index 8e76529d..996d4398 100644
--- a/lib/src/main/java/com/rey/material/widget/RippleManager.java
+++ b/lib/src/main/java/com/rey/material/widget/RippleManager.java
@@ -13,6 +13,7 @@
 import com.rey.material.R;
 import com.rey.material.drawable.RippleDrawable;
 import com.rey.material.drawable.ToolbarRippleDrawable;
+import com.rey.material.util.ViewUtil;
 
 public final class RippleManager implements View.OnClickListener, Runnable{
 
@@ -20,9 +21,15 @@ public final class RippleManager implements View.OnClickListener, Runnable{
 	private View mView;
 		
 	public RippleManager(){}
-	
-	@SuppressWarnings("deprecation")
-	@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+
+    /**
+     * Should be called in the construction method of view to create a RippleDrawable.
+     * @param v
+     * @param context
+     * @param attrs
+     * @param defStyleAttr
+     * @param defStyleRes
+     */
 	public void onCreate(View v, Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes){
 		if(v.isInEditMode())
 			return;
@@ -43,37 +50,14 @@ public void onCreate(View v, Context context, AttributeSet attrs, int defStyleAt
 
 		a.recycle();
 
-		if(drawable != null) {
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
-				mView.setBackground(drawable);
-			else
-				mView.setBackgroundDrawable(drawable);
-		}
-	}
-	
-	public boolean isDelayClick(){
-        Drawable background = mView.getBackground();
-        if(background instanceof RippleDrawable)
-            return ((RippleDrawable)background).isDelayClick();
-        else if(background instanceof ToolbarRippleDrawable)
-            return ((ToolbarRippleDrawable)background).isDelayClick();
-
-        return false;
+		if(drawable != null)
+            ViewUtil.setBackground(mView, drawable);
 	}
-	
-	public void setDelayClick(boolean delay){
-        Drawable background = mView.getBackground();
-        if(background instanceof RippleDrawable)
-            ((RippleDrawable)background).setDelayClick(delay);
-        else if(background instanceof ToolbarRippleDrawable)
-            ((ToolbarRippleDrawable)background).setDelayClick(delay);
-	}
-	
+		
 	public void setOnClickListener(View.OnClickListener l) {
 		mClickListener = l;
 	}
 
-
 	public boolean onTouchEvent(MotionEvent event){
 		Drawable background = mView.getBackground();
         return background instanceof RippleDrawable && ((RippleDrawable) background).onTouch(mView, event);
@@ -101,6 +85,10 @@ public void run() {
     		mClickListener.onClick(mView);
     }
 
+    /**
+     * Cancel the ripple effect of this view and all of it's children.
+     * @param v
+     */
 	public static void cancelRipple(View v){
 		Drawable background = v.getBackground();
 		if(background instanceof RippleDrawable)
diff --git a/lib/src/main/java/com/rey/material/widget/Slider.java b/lib/src/main/java/com/rey/material/widget/Slider.java
index cdb61119..00dd3519 100644
--- a/lib/src/main/java/com/rey/material/widget/Slider.java
+++ b/lib/src/main/java/com/rey/material/widget/Slider.java
@@ -80,8 +80,23 @@ public class Slider extends View{
     private ThumbStrokeAnimator mThumbStrokeAnimator;
     private ThumbMoveAnimator mThumbMoveAnimator;
 
+    private boolean mIsRtl = false;
+
+    /**
+     * Interface definition for a callback to be invoked when thumb's position changed.
+     */
     public interface OnPositionChangeListener{
-        public void onPositionChanged(Slider view, float oldPos, float newPos, int oldValue, int newValue);
+        /**
+         * Called when thumb's position changed.
+         *
+         * @param view The view fire this event.
+         * @param fromUser Indicate the change is from user touch event or not.
+         * @param oldPos The old position of thumb.
+         * @param newPos The new position of thumb.
+         * @param oldValue The old value.
+         * @param newValue The new value.
+         */
+        public void onPositionChanged(Slider view, boolean fromUser, float oldPos, float newPos, int oldValue, int newValue);
     }
 
     private OnPositionChangeListener mOnPositionChangeListener;
@@ -202,23 +217,78 @@ private String getValueText(){
         return mValueText;
     }
 
+    /**
+     * @return The minimum selectable value.
+     */
+    public int getMinValue(){
+        return mMinValue;
+    }
+
+    /**
+     * @return The maximum selectable value.
+     */
+    public int getMaxValue(){
+        return mMaxValue;
+    }
+
+    /**
+     * @return The step value.
+     */
+    public int getStepValue(){
+        return mStepValue;
+    }
+
+    /**
+     * Set the randge of selectable value.
+     * @param min The minimum selectable value.
+     * @param max The maximum selectable value.
+     * @param animation Indicate that should show animation when thumb's current position changed.
+     */
+    public void setValueRange(int min, int max, boolean animation){
+        if(max < min || (min == mMinValue && max == mMaxValue))
+            return;
+
+        float oldValue = getExactValue();
+        float oldPosition = getPosition();
+        mMinValue = min;
+        mMaxValue = max;
+
+        setValue(oldValue, animation);
+        if(mOnPositionChangeListener != null && oldPosition == getPosition() && oldValue != getExactValue())
+            mOnPositionChangeListener.onPositionChanged(this, false, oldPosition, oldPosition, Math.round(oldValue), getValue());
+    }
+
+    /**
+     * @return The selected value.
+     */
     public int getValue(){
         return Math.round(getExactValue());
     }
 
+    /**
+     * @return The exact selected value.
+     */
     public float getExactValue(){
         return (mMaxValue - mMinValue) * getPosition() + mMinValue;
     }
 
+    /**
+     * @return The current position of thumb in [0..1] range.
+     */
     public float getPosition(){
         return mThumbMoveAnimator.isRunning() ? mThumbMoveAnimator.getPosition() : mThumbPosition;
     }
 
+    /**
+     * Set current position of thumb.
+     * @param pos The position in [0..1] range.
+     * @param animation Indicate that should show animation when change thumb's position.
+     */
     public void setPosition(float pos, boolean animation){
-        setPosition(pos, animation, animation);
+        setPosition(pos, animation, animation, false);
     }
 
-    private void setPosition(float pos, boolean moveAnimation, boolean transformAnimation){
+    private void setPosition(float pos, boolean moveAnimation, boolean transformAnimation, boolean fromUser){
         boolean change = getPosition() != pos;
         int oldValue = getValue();
         float oldPos = getPosition();
@@ -242,14 +312,23 @@ private void setPosition(float pos, boolean moveAnimation, boolean transformAnim
         float newPos = getPosition();
 
         if(change && mOnPositionChangeListener != null)
-            mOnPositionChangeListener.onPositionChanged(this, oldPos, newPos, oldValue, newValue);
+            mOnPositionChangeListener.onPositionChanged(this, fromUser, oldPos, newPos, oldValue, newValue);
     }
 
+    /**
+     * Set the selected value of this Slider.
+     * @param value The selected value.
+     * @param animation Indicate that should show animation when change thumb's position.
+     */
     public void setValue(float value, boolean animation){
         value = Math.min(mMaxValue, Math.max(value, mMinValue));
         setPosition((value - mMinValue) / (mMaxValue - mMinValue), animation);
     }
 
+    /**
+     * Set a listener will be called when thumb's position changed.
+     * @param listener The {@link Slider.OnPositionChangeListener} will be called.
+     */
     public void setOnPositionChangeListener(OnPositionChangeListener listener){
         mOnPositionChangeListener = listener;
     }
@@ -312,6 +391,15 @@ public int getSuggestedMinimumHeight() {
         return (mDiscreteMode ? (int)(mThumbRadius * (4 + Math.sqrt(2))) : mThumbFocusRadius * 2) + getPaddingTop() + getPaddingBottom();
     }
 
+    @Override
+    public void onRtlPropertiesChanged(int layoutDirection) {
+        boolean rtl = layoutDirection == LAYOUT_DIRECTION_RTL;
+        if(mIsRtl != rtl) {
+            mIsRtl = rtl;
+            invalidate();
+        }
+    }
+
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         mDrawRect.left = getPaddingLeft() + mThumbRadius;
@@ -375,7 +463,7 @@ private float correctPosition(float position){
         int valueOffset = Math.round(totalOffset * position);
         int stepOffset = valueOffset / mStepValue;
         int lowerValue = stepOffset * mStepValue;
-        int higherValue = Math.min(mMaxValue, (stepOffset + 1) * mStepValue);
+        int higherValue = Math.min(totalOffset, (stepOffset + 1) * mStepValue);
 
         if(valueOffset - lowerValue < higherValue - valueOffset)
             position = lowerValue / (float)totalOffset;
@@ -393,24 +481,29 @@ public boolean onTouchEvent(@NonNull MotionEvent event) {
         if(!isEnabled())
             return false;
 
+        float x = event.getX();
+        float y = event.getY();
+        if(mIsRtl)
+            x = 2 * mDrawRect.centerX() - x;
+
         switch (event.getAction()) {
             case MotionEvent.ACTION_DOWN:
-                mIsDragging = isThumbHit(event.getX(), event.getY(), mThumbRadius) && !mThumbMoveAnimator.isRunning();
-                mMemoPoint.set(event.getX(), event.getY());
+                mIsDragging = isThumbHit(x, y, mThumbRadius) && !mThumbMoveAnimator.isRunning();
+                mMemoPoint.set(x, y);
                 if(mIsDragging)
                     mThumbRadiusAnimator.startAnimation(mDiscreteMode ? 0 : mThumbFocusRadius);
                 break;
             case MotionEvent.ACTION_MOVE:
                 if(mIsDragging) {
                     if(mDiscreteMode) {
-                        float position = correctPosition(Math.min(1f, Math.max(0f, (event.getX() - mDrawRect.left) / mDrawRect.width())));
-                        setPosition(position, true);
+                        float position = correctPosition(Math.min(1f, Math.max(0f, (x - mDrawRect.left) / mDrawRect.width())));
+                        setPosition(position, true, true, true);
                     }
                     else{
-                        float offset = (event.getX() - mMemoPoint.x) / mDrawRect.width();
+                        float offset = (x - mMemoPoint.x) / mDrawRect.width();
                         float position = Math.min(1f, Math.max(0f, mThumbPosition + offset));
-                        setPosition(position, false, true);
-                        mMemoPoint.x = event.getX();
+                        setPosition(position, false, true, true);
+                        mMemoPoint.x = x;
                         invalidate();
                     }
                 }
@@ -418,17 +511,17 @@ public boolean onTouchEvent(@NonNull MotionEvent event) {
             case MotionEvent.ACTION_UP:
                 if(mIsDragging) {
                     mIsDragging = false;
-                    setPosition(getPosition(), true);
+                    setPosition(getPosition(), true, true, true);
                 }
-                else if(distance(mMemoPoint.x, mMemoPoint.y, event.getX(), event.getY()) <= mTouchSlop){
-                    float position = correctPosition(Math.min(1f, Math.max(0f, (event.getX() - mDrawRect.left) / mDrawRect.width())));
-                    setPosition(position, true);
+                else if(distance(mMemoPoint.x, mMemoPoint.y, x, y) <= mTouchSlop){
+                    float position = correctPosition(Math.min(1f, Math.max(0f, (x - mDrawRect.left) / mDrawRect.width())));
+                    setPosition(position, true, true, true);
                 }
                 break;
             case MotionEvent.ACTION_CANCEL:
                 if(mIsDragging) {
                     mIsDragging = false;
-                    setPosition(getPosition(), true);
+                    setPosition(getPosition(), true, true, true);
                 }
                 break;
         }
@@ -588,16 +681,19 @@ public void draw(@NonNull Canvas canvas) {
         super.draw(canvas);
 
         float x = mDrawRect.width() * mThumbPosition + mDrawRect.left;
+        if(mIsRtl)
+            x = 2 * mDrawRect.centerX() - x;
         float y = mDrawRect.centerY();
         int filledPrimaryColor = ColorUtil.getMiddleColor(mSecondaryColor, isEnabled() ? mPrimaryColor : mSecondaryColor, mThumbFillPercent);
 
         getTrackPath(x, y, mThumbCurrentRadius);
         mPaint.setStyle(Paint.Style.FILL);
-        mPaint.setColor(mSecondaryColor);
+        mPaint.setColor(mIsRtl ? filledPrimaryColor : mSecondaryColor);
         canvas.drawPath(mRightTrackPath, mPaint);
-        mPaint.setColor(filledPrimaryColor);
+        mPaint.setColor(mIsRtl ? mSecondaryColor : filledPrimaryColor);
         canvas.drawPath(mLeftTrackPath, mPaint);
 
+        mPaint.setColor(filledPrimaryColor);
         if(mDiscreteMode){
             float factor = 1f - mThumbCurrentRadius / mThumbRadius;
 
diff --git a/lib/src/main/java/com/rey/material/widget/SnackBar.java b/lib/src/main/java/com/rey/material/widget/SnackBar.java
index 35800c0c..7659c354 100644
--- a/lib/src/main/java/com/rey/material/widget/SnackBar.java
+++ b/lib/src/main/java/com/rey/material/widget/SnackBar.java
@@ -29,6 +29,7 @@
 import com.rey.material.R;
 import com.rey.material.drawable.RippleDrawable;
 import com.rey.material.util.ThemeUtil;
+import com.rey.material.util.ViewUtil;
 
 public class SnackBar extends FrameLayout {
 
@@ -39,7 +40,7 @@ public class SnackBar extends FrameLayout {
 	public static final int WRAP_CONTENT = ViewGroup.LayoutParams.WRAP_CONTENT;
 	
 	private BackgroundDrawable mBackground;
-	private int mMarginLeft;
+	private int mMarginStart;
 	private int mMarginBottom;
 	private int mWidth;
 	private int mHeight;
@@ -59,21 +60,52 @@ public void run() {
     };
 	
 	private int mState = STATE_DISMISSED;
-		
+
+	/**
+	 * Indicate this SnackBar is already dismissed.
+	 */
 	public static final int STATE_DISMISSED = 0;
-	public static final int STATE_SHOWED = 1;
+	/**
+	 * Indicate this SnackBar is already shown.
+	 */
+	public static final int STATE_SHOWN = 1;
+	/**
+	 * Indicate this SnackBar is being shown.
+	 */
 	public static final int STATE_SHOWING = 2;
+	/**
+	 * Indicate this SnackBar is being dismissed.
+	 */
 	public static final int STATE_DISMISSING = 3;
-	
+
+    private boolean mIsRtl = false;
+
+	/**
+	 * Interface definition for a callback to be invoked when action button is clicked.
+	 */
 	public interface OnActionClickListener{
-		
+
+		/**
+		 * Called when action button is clicked.
+		 * @param sb The SnackBar fire this event.
+		 * @param actionId The ActionId of this SnackBar.
+		 */
 		public void onActionClick(SnackBar sb, int actionId);
 	}
 	
 	private OnActionClickListener mActionClickListener;
-	
+
+	/**
+	 * Interface definition for a callback to be invoked when SnackBar's state is changed.
+	 */
 	public interface OnStateChangeListener{
-		
+
+		/**
+		 * Called when SnackBar's state is changed.
+		 * @param sb The SnackBar fire this event.
+		 * @param oldState The old state of SnackBar.
+		 * @param newState The new state of SnackBar.
+		 */
 		public void onStateChange(SnackBar sb, int oldState, int newState);
 	}
 	
@@ -103,7 +135,6 @@ public SnackBar(Context context, AttributeSet attrs, int defStyleAttr, int defSt
         init(context, attrs, defStyleAttr, defStyleRes);
     }
 
-    @SuppressWarnings("deprecation")
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
     private void init(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes){
         mText = new TextView(context);
@@ -128,29 +159,42 @@ public void onClick(View v) {
 
 
         mBackground = new BackgroundDrawable();
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
-            setBackground(mBackground);
-        else
-            setBackgroundDrawable(mBackground);
-
+        ViewUtil.setBackground(this, mBackground);
         setClickable(true);
 
         applyStyle(context, attrs, defStyleAttr, defStyleRes);
     }
 
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
+    @Override
+    public void onRtlPropertiesChanged(int layoutDirection) {
+        boolean rtl = layoutDirection == LAYOUT_DIRECTION_RTL;
+        if(mIsRtl != rtl) {
+            mIsRtl = rtl;
+
+            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1){
+                mText.setTextDirection((mIsRtl ? TEXT_DIRECTION_RTL : TEXT_DIRECTION_LTR));
+                mAction.setTextDirection((mIsRtl ? TEXT_DIRECTION_RTL : TEXT_DIRECTION_LTR));
+            }
+
+            requestLayout();
+        }
+    }
+
     @Override
 	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 		int widthSize = MeasureSpec.getSize(widthMeasureSpec);
 		int widthMode = MeasureSpec.getMode(widthMeasureSpec);
 		int heightSize = MeasureSpec.getSize(heightMeasureSpec);
 		int heightMode = MeasureSpec.getMode(heightMeasureSpec);
-		int width = 0;
-		int height = 0;
+		int width;
+		int height;
 		
 		if(mAction.getVisibility() == View.VISIBLE){
 			mAction.measure(MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED), heightMeasureSpec);
-			mText.measure(MeasureSpec.makeMeasureSpec(widthSize - (mAction.getMeasuredWidth() - mText.getPaddingRight()), widthMode), heightMeasureSpec);
-			width = mText.getMeasuredWidth() + mAction.getMeasuredWidth() - mText.getPaddingRight();
+            int padding = mIsRtl ? mText.getPaddingLeft() : mText.getPaddingRight();
+            mText.measure(MeasureSpec.makeMeasureSpec(widthSize - (mAction.getMeasuredWidth() - padding), widthMode), heightMeasureSpec);
+            width = mText.getMeasuredWidth() + mAction.getMeasuredWidth() - padding;
 		}
 		else{
 			mText.measure(MeasureSpec.makeMeasureSpec(widthSize, widthMode), heightMeasureSpec);
@@ -194,14 +238,19 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
 		int childBottom = b - t - getPaddingBottom();
 				
 		if(mAction.getVisibility() == View.VISIBLE){
-			mAction.layout(childRight - mAction.getMeasuredWidth(), childTop, childRight, childBottom);
-			mText.layout(childLeft, childTop, childRight - mAction.getMeasuredWidth() + mText.getPaddingRight(), childBottom);
+            if(mIsRtl) {
+                mAction.layout(childLeft, childTop, childLeft + mAction.getMeasuredWidth(), childBottom);
+                childLeft += mAction.getMeasuredWidth() - mText.getPaddingLeft();
+            }
+            else {
+                mAction.layout(childRight - mAction.getMeasuredWidth(), childTop, childRight, childBottom);
+                childRight -= mAction.getMeasuredWidth() - mText.getPaddingRight();
+            }
 		}
-		else			
-			mText.layout(childLeft, childTop, childRight, childBottom);
+
+        mText.layout(childLeft, childTop, childRight, childBottom);
 	}		
 
-	@SuppressWarnings("deprecation")
 	@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
 	private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes){
 		TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SnackBar, defStyleAttr, defStyleRes);
@@ -224,7 +273,7 @@ private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, i
 			mHeight = a.getDimensionPixelSize(R.styleable.SnackBar_sb_height, WRAP_CONTENT);
         int minHeight = a.getDimensionPixelSize(R.styleable.SnackBar_sb_minHeight, 0);
         int maxHeight = a.getDimensionPixelSize(R.styleable.SnackBar_sb_maxHeight, 0);
-		mMarginLeft = a.getDimensionPixelSize(R.styleable.SnackBar_sb_marginLeft, 0);
+		mMarginStart = a.getDimensionPixelSize(R.styleable.SnackBar_sb_marginStart, 0);
 		mMarginBottom = a.getDimensionPixelSize(R.styleable.SnackBar_sb_marginBottom, 0);
 		int textSize = a.getDimensionPixelSize(R.styleable.SnackBar_sb_textSize, 0);
 		boolean hasTextColor = a.hasValue(R.styleable.SnackBar_sb_textColor);		
@@ -315,56 +364,111 @@ public SnackBar applyStyle(int resId){
         return this;
     }
 
+	/**
+	 * Set the text that this SnackBar is to display.
+	 * @param text The text is displayed.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar text(CharSequence text){
 		mText.setText(text);
 		return this;
 	}
-	
+
+	/**
+	 * Set the text that this SnackBar is to display.
+	 * @param id The resourceId of text is displayed.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar text(int id){
 		return text(getContext().getResources().getString(id));
 	}
-	
+
+	/**
+	 * Set the text color.
+	 * @param color The color of text.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar textColor(int color){
 		mText.setTextColor(color);
 		return this;
 	}
-	
-	public SnackBar textSize(int size){
-		mText.setTextSize(TypedValue.COMPLEX_UNIT_PX, size);
+
+	/**
+	 * Set the text size to the given value, interpreted as "scaled pixel" units.
+	 * @param size The size of text.
+	 * @return This SnackBar for chaining methods.
+	 */
+	public SnackBar textSize(float size){
+		mText.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
 		return this;
 	}
-	
+
+	/**
+	 * Sets the text color, size, style from the specified TextAppearance resource.
+	 * @param resId The resourceId value.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar textAppearance(int resId){
 		if(resId != 0)
 			mText.setTextAppearance(getContext(), resId);
 		return this;
 	}
-	
+
+	/**
+	 * Causes words in the text that are longer than the view is wide to be ellipsized instead of broken in the middle.
+	 * @param at
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar ellipsize(TruncateAt at){
 		mText.setEllipsize(at);
 		return this;
 	}
-	
+
+	/**
+	 * Sets the text will be single-line or not.
+	 * @param b
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar singleLine(boolean b){
 		mText.setSingleLine(b);
 		return this;
 	}
-	
+
+	/**
+	 * Makes the text at most this many lines tall.
+	 * @param lines The maximum line value.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar maxLines(int lines){
 		mText.setMaxLines(lines);
 		return this;
 	}
-	
+
+	/**
+	 * Makes the text exactly this many lines tall.
+	 * @param lines The line number.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar lines(int lines){
 		mText.setLines(lines);
 		return this;
 	}
-	
+
+	/**
+	 * Set the actionId of this SnackBar. Used to determine the current action of this SnackBar.
+	 * @param id The actionId value.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar actionId(int id){
 		mActionId = id;		
 		return this;
 	}
-	
+
+	/**
+	 * Set the text that the ActionButton is to display.
+	 * @param text If null, then the ActionButton will be hidden.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar actionText(CharSequence text){
 		if(TextUtils.isEmpty(text))
 			mAction.setVisibility(View.INVISIBLE);
@@ -374,139 +478,257 @@ public SnackBar actionText(CharSequence text){
 		}
 		return this;
 	}
-	
+
+	/**
+	 * Set the text that the ActionButton is to display.
+	 * @param id If 0, then the ActionButton will be hidden.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar actionText(int id){
 		if(id == 0)
 			return actionText(null);
 		
 		return actionText(getContext().getResources().getString(id));
 	}
-	
+
+	/**
+	 * Set the text color of the ActionButton for all states.
+	 * @param color The color of text.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar actionTextColor(int color){
 		mAction.setTextColor(color);
 		return this;
 	}
-	
+
+	/**
+	 * Set the text color of the ActionButton.
+	 * @param colors
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar actionTextColor(ColorStateList colors){
 		mAction.setTextColor(colors);
 		return this;
 	}
-	
+
+	/**
+	 * Sets the text color, size, style of the ActionButton from the specified TextAppearance resource.
+	 * @param resId The resourceId value.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar actionTextAppearance(int resId){
 		if(resId != 0)
 			mAction.setTextAppearance(getContext(), resId);
 		return this;
 	}
-	
-	public SnackBar actionTextSize(int size){
-		mAction.setTextSize(TypedValue.COMPLEX_UNIT_PX, size);
+
+	/**
+	 * Set the text size of the ActionButton to the given value, interpreted as "scaled pixel" units.
+	 * @param size The size of text.
+	 * @return This SnackBar for chaining methods.
+	 */
+	public SnackBar actionTextSize(float size){
+		mAction.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
 		return this;
 	}
-	
-	@SuppressWarnings("deprecation")
-	@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+
+	/**
+	 * Set the style of RippleEffect of the ActionButton.
+	 * @param resId The resourceId of RippleEffect.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar actionRipple(int resId){
-		if(resId != 0){
-			if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
-				mAction.setBackground(new RippleDrawable.Builder(getContext(), resId).build());
-			else
-				mAction.setBackgroundDrawable(new RippleDrawable.Builder(getContext(), resId).build());
-		}	
+		if(resId != 0)
+            ViewUtil.setBackground(mAction, new RippleDrawable.Builder(getContext(), resId).build());
 		return this;
 	}
-	
+
+	/**
+	 * Set the duration this SnackBar will be shown before dismissing.
+	 * @param duration If 0, then the SnackBar will not be dismissed until {@link #dismiss() dismiss()} is called.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar duration(long duration){
 		mDuration = duration;
 		return this;
 	}
-	
+
+	/**
+	 * Set the background color of this SnackBar.
+	 * @param color The color of background.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar backgroundColor(int color){
 		mBackground.setColor(color);
 		return this;
 	}
-	
+
+	/**
+	 * Set the background's corner radius of this SnackBar.
+	 * @param radius The corner radius.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar backgroundRadius(int radius){
 		mBackground.setRadius(radius);
 		return this;
 	}
-	
+
+	/**
+	 * Set the horizontal padding between this SnackBar and it's text and button.
+	 * @param padding
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar horizontalPadding(int padding){
 		mText.setPadding(padding, mText.getPaddingTop(), padding, mText.getPaddingBottom());	
 		mAction.setPadding(padding, mAction.getPaddingTop(), padding, mAction.getPaddingBottom());
 		return this;
 	}
-	
+
+	/**
+	 * Set the vertical padding between this SnackBar and it's text and button.
+	 * @param padding
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar verticalPadding(int padding){
 		mText.setPadding(mText.getPaddingLeft(), padding, mText.getPaddingRight(), padding);	
 		mAction.setPadding(mAction.getPaddingLeft(), padding, mAction.getPaddingRight(), padding);
 		return this;
 	}
-	
+
+	/**
+	 * Set the padding between this SnackBar and it's text and button.
+	 * @param horizontalPadding The horizontal padding.
+	 * @param verticalPadding The vertical padding.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar padding(int horizontalPadding, int verticalPadding){
 		mText.setPadding(horizontalPadding, verticalPadding, horizontalPadding, verticalPadding);		
 		mAction.setPadding(horizontalPadding, verticalPadding, horizontalPadding, verticalPadding);		
 		return this;
 	}
-	
+
+	/**
+	 * Makes this SnackBar exactly this many pixels wide.
+	 * @param width The width value in pixels.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar width(int width){
 		mWidth = width;
 		return this;
 	}
-	
+
+	/**
+	 * Makes this SnackBar at least this many pixels wide
+	 * @param width The minimum width value in pixels.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar minWidth(int width){
 		mText.setMinWidth(width);
 		return this;
 	}
-	
+
+	/**
+	 * Makes this SnackBar at most this many pixels wide
+	 * @param width The maximum width value in pixels.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar maxWidth(int width){
 		mText.setMaxWidth(width);
 		return this;
 	}
-	
+
+	/**
+	 * Makes this SnackBar exactly this many pixels tall.
+	 * @param height The height value in pixels.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar height(int height){
 		mHeight = height;
 		return this;
 	}
 
+	/**
+	 * Makes this SnackBar at most this many pixels tall
+	 * @param height The maximum height value in pixels.
+	 * @return This SnackBar for chaining methods.
+	 */
     public SnackBar maxHeight(int height){
         mMaxHeight = height;
         return this;
     }
 
+	/**
+	 * Makes this SnackBar at least this many pixels tall
+	 * @param height The maximum height value in pixels.
+	 * @return This SnackBar for chaining methods.
+	 */
     public SnackBar minHeight(int height){
         mMinHeight = height;
         return this;
     }
-	
-	public SnackBar marginLeft(int size){
-		mMarginLeft = size;
+
+	/**
+	 * Set the start margin between this SnackBar and it's parent.
+	 * @param size
+	 * @return This SnackBar for chaining methods.
+	 */
+	public SnackBar marginStart(int size){
+		mMarginStart = size;
 		return this;
 	}
-	
+
+	/**
+	 * Set the bottom margin between this SnackBar and it's parent.
+	 * @param size
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar marginBottom(int size){
 		mMarginBottom = size;
 		return this;
 	}
-	
+
+	/**
+	 * Set the listener will be called when the ActionButton is clicked.
+	 * @param listener The {@link SnackBar.OnActionClickListener} will be called.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar actionClickListener(OnActionClickListener listener){
 		mActionClickListener = listener;
 		return this;
 	}
-	
+
+	/**
+	 * Set the listener will be called when this SnackBar's state is changed.
+	 * @param listener The {@link SnackBar.OnStateChangeListener} will be called.
+	 * @return This SnackBar for chaining methods.
+	 */
 	public SnackBar stateChangeListener(OnStateChangeListener listener){
 		mStateChangeListener = listener;
 		return this;
 	}
 
+	/**
+	 * Indicate that this SnackBar should remove itself from parent view after being dismissed.
+	 * @param b
+	 * @return This SnackBar for chaining methods.
+	 */
     public SnackBar removeOnDismiss(boolean b){
         mRemoveOnDismiss = b;
         return this;
     }
 
+	/**
+	 * Show this SnackBar. It will auto attach to the activity's root view.
+	 * @param activity
+	 */
 	public void show(Activity activity){
         show((ViewGroup)activity.getWindow().findViewById(Window.ID_ANDROID_CONTENT));
 	}
 
+	/**
+	 * Show this SnackBar. It will auto attach to the parent view.
+	 * @param parent Must be {@linke android.widget.FrameLayout} or {@link android.widget.RelativeLayout}
+	 */
     public void show(ViewGroup parent){
         if(mState == STATE_SHOWING || mState == STATE_DISMISSING)
             return;
@@ -521,6 +743,10 @@ public void show(ViewGroup parent){
         show();
     }
 
+	/**
+	 * Show this SnackBar.
+	 * Make sure it already attached to a parent view or this method will do nothing.
+	 */
     public void show(){
         ViewGroup parent = (ViewGroup)getParent();
         if(parent == null || mState == STATE_SHOWING || mState == STATE_DISMISSING)
@@ -531,8 +757,11 @@ public void show(){
 
             params.width = mWidth;
             params.height = mHeight;
-            params.gravity = Gravity.BOTTOM;
-            params.leftMargin = mMarginLeft;
+            params.gravity = Gravity.START | Gravity.BOTTOM;
+			if(mIsRtl)
+				params.rightMargin = mMarginStart;
+			else
+            	params.leftMargin = mMarginStart;
             params.bottomMargin = mMarginBottom;
         }
         else if(parent instanceof RelativeLayout){
@@ -541,11 +770,15 @@ else if(parent instanceof RelativeLayout){
             params.width = mWidth;
             params.height = mHeight;
             params.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
-            params.leftMargin = mMarginLeft;
+			params.addRule(RelativeLayout.ALIGN_PARENT_START);
+			if(mIsRtl)
+				params.rightMargin = mMarginStart;
+			else
+            	params.leftMargin = mMarginStart;
             params.bottomMargin = mMarginBottom;
         }
 
-        if(mInAnimationId != 0 && mState != STATE_SHOWED){
+        if(mInAnimationId != 0 && mState != STATE_SHOWN){
             Animation anim = AnimationUtils.loadAnimation(getContext(), mInAnimationId);
             anim.setAnimationListener(new Animation.AnimationListener() {
 
@@ -560,7 +793,7 @@ public void onAnimationRepeat(Animation animation) {}
 
                 @Override
                 public void onAnimationEnd(Animation animation) {
-                    setState(STATE_SHOWED);
+                    setState(STATE_SHOWN);
                     startTimer();
                 }
             });
@@ -568,7 +801,7 @@ public void onAnimationEnd(Animation animation) {
         }
         else{
             setVisibility(View.VISIBLE);
-            setState(STATE_SHOWED);
+            setState(STATE_SHOWN);
             startTimer();
         }
     }
@@ -578,9 +811,12 @@ private void startTimer(){
 		if(mDuration > 0)
 			postDelayed(mDismissRunnable, mDuration);
 	}
-	
+
+	/**
+	 * Dismiss this SnackBar. It must be in {@link #STATE_SHOWN} to be dismissed.
+	 */
 	public void dismiss(){
-		if(mState != STATE_SHOWED)
+		if(mState != STATE_SHOWN)
 			return;
 		
 		removeCallbacks(mDismissRunnable);
@@ -617,7 +853,11 @@ public void onAnimationEnd(Animation animation) {
 		}		
 		
 	}
-	
+
+	/**
+	 * Get the current state of this SnackBar.
+	 * @return The current state of this SnackBar. Can be {@link #STATE_DISMISSED}, {@link #STATE_DISMISSING}, {@link #STATE_SHOWING} or {@link #STATE_SHOWN}.
+	 */
 	public int getState(){
 		return mState;
 	}
diff --git a/lib/src/main/java/com/rey/material/widget/Spinner.java b/lib/src/main/java/com/rey/material/widget/Spinner.java
index ff703bbb..73356cf8 100644
--- a/lib/src/main/java/com/rey/material/widget/Spinner.java
+++ b/lib/src/main/java/com/rey/material/widget/Spinner.java
@@ -17,6 +17,8 @@
 import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.view.GravityCompat;
+import android.support.v4.view.ViewCompat;
+import android.support.v4.view.ViewGroupCompat;
 import android.support.v7.internal.widget.TintManager;
 import android.support.v7.internal.widget.TintTypedArray;
 import android.support.v7.internal.widget.ViewUtils;
@@ -33,6 +35,7 @@
 import android.view.animation.Interpolator;
 import android.widget.AdapterView;
 import android.widget.FrameLayout;
+import android.widget.GridView;
 import android.widget.ListAdapter;
 import android.widget.SpinnerAdapter;
 
@@ -50,12 +53,33 @@ public class Spinner extends FrameLayout {
 	private static final int MAX_ITEMS_MEASURED = 15;
 	
 	private static final int INVALID_POSITION = -1;
-	
+
+    /**
+     * Interface definition for a callback to be invoked when a item's view is clicked.
+     */
 	public interface OnItemClickListener{
+        /**
+         * Called when a item's view is clicked.
+         * @param parent The Spinner view.
+         * @param view The item view.
+         * @param position The position of item.
+         * @param id The id of item.
+         * @return false will make the Spinner doesn't select this item.
+         */
 		boolean onItemClick(Spinner parent, View view, int position, long id);
 	}
-	
+
+    /**
+     * Interface definition for a callback to be invoked when an item is selected.
+     */
 	public interface OnItemSelectedListener{
+        /**
+         * Called when an item is selected.
+         * @param parent The Spinner view.
+         * @param view The item view.
+         * @param position The position of item.
+         * @param id The id of item.
+         */
 		void onItemSelected(Spinner parent, View view, int position, long id);
 	}
 
@@ -97,6 +121,8 @@ public interface OnItemSelectedListener{
 	private TintManager mTintManager;
 	
 	private RippleManager mRippleManager = new RippleManager();
+
+    private boolean mIsRtl = false;
 		
 	public Spinner(Context context) {
 		super(context);
@@ -154,9 +180,11 @@ private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, i
         TintTypedArray a = TintTypedArray.obtainStyledAttributes(context, attrs,  R.styleable.Spinner, defStyleAttr, defStyleRes);
 
         mLabelEnable = a.getBoolean(R.styleable.Spinner_spn_labelEnable, false);
+
         if(mLabelEnable){
             mLabelView = new LabelView(context);
-            mLabelView.setGravity(GravityCompat.START);
+            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
+                mLabelView.setTextDirection(mIsRtl ? TEXT_DIRECTION_RTL : TEXT_DIRECTION_LTR);
             mLabelView.setSingleLine(true);
             int labelPadding = a.getDimensionPixelOffset(R.styleable.Spinner_spn_labelPadding, 0);
             int labelTextSize = a.getDimensionPixelSize(R.styleable.Spinner_spn_labelTextSize, 0);
@@ -219,8 +247,10 @@ private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, i
         Interpolator arrowInterpolator = resId != 0 ? AnimationUtils.loadInterpolator(context, resId) : null;
         boolean arrowClockwise = a.getBoolean(R.styleable.Spinner_spn_arrowAnimClockwise, true);
 
-        mArrowDrawable = new ArrowDrawable(ArrowDrawable.MODE_DOWN, mArrowSize, arrowColor, arrowAnimDuration, arrowInterpolator, arrowClockwise);
-        mArrowDrawable.setCallback(this);
+        if(mArrowSize > 0) {
+            mArrowDrawable = new ArrowDrawable(ArrowDrawable.MODE_DOWN, mArrowSize, arrowColor, arrowAnimDuration, arrowInterpolator, arrowClockwise);
+            mArrowDrawable.setCallback(this);
+        }
 
         mDividerHeight = a.getDimensionPixelOffset(R.styleable.Spinner_spn_dividerHeight, 0);
         mDividerPadding = a.getDimensionPixelOffset(R.styleable.Spinner_spn_dividerPadding, 0);
@@ -257,11 +287,32 @@ private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, i
             setAdapter(mAdapter);
     }
 
-	public View getSelectedView() {
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
+    @Override
+    public void onRtlPropertiesChanged(int layoutDirection) {
+        boolean rtl = layoutDirection == LAYOUT_DIRECTION_RTL;
+        if(mIsRtl != rtl) {
+            mIsRtl = rtl;
+
+            if(mLabelView != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
+                mLabelView.setTextDirection(mIsRtl ? TEXT_DIRECTION_RTL : TEXT_DIRECTION_LTR);
+
+            requestLayout();
+        }
+    }
+
+    /**
+     * @return The selected item's view.
+     */
+    public View getSelectedView() {
         View v = getChildAt(getChildCount() - 1);
 		return v == mLabelView ? null : v;
 	}
 
+    /**
+     * Set the selected position of this Spinner.
+     * @param position The selected position.
+     */
 	public void setSelection(int position) {
 		if(mAdapter != null)
 			position = Math.min(position, mAdapter.getCount() - 1);
@@ -275,15 +326,32 @@ public void setSelection(int position) {
 			onDataInvalidated();
 		}
 	}
-	
+
+    /**
+     * @return The selected posiiton.
+     */
 	public int getSelectedItemPosition(){
 		return mSelectedPosition;
 	}
-		
+
+    /**
+     * @return The selected item.
+     */
+    public Object getSelectedItem(){
+        return mAdapter == null ? null : mAdapter.getItem(mSelectedPosition);
+    }
+
+    /**
+     * @return The adapter back this Spinner.
+     */
 	public SpinnerAdapter getAdapter() {
 		return mAdapter;
 	}
 
+    /**
+     * Set an adapter for this Spinner.
+     * @param adapter
+     */
 	public void setAdapter(SpinnerAdapter adapter) {	
 		if(mAdapter != null)
 			mAdapter.unregisterDataSetObserver(mDataSetObserver);
@@ -299,39 +367,110 @@ public void setAdapter(SpinnerAdapter adapter) {
         else
             mTempAdapter = new DropDownAdapter(adapter);        
 	}
-	
+
+    /**
+     * Set the background drawable for the spinner's popup window of choices.
+     *
+     * @param background Background drawable
+     *
+     * @attr ref android.R.styleable#Spinner_popupBackground
+     */
     public void setPopupBackgroundDrawable(Drawable background) {
     	mPopup.setBackgroundDrawable(background);
     }
 
+    /**
+     * Set the background drawable for the spinner's popup window of choices.
+     *
+     * @param resId Resource ID of a background drawable
+     *
+     * @attr ref android.R.styleable#Spinner_popupBackground
+     */
     public void setPopupBackgroundResource(int resId) {
         setPopupBackgroundDrawable(mTintManager.getDrawable(resId));
     }
 
+    /**
+     * Get the background drawable for the spinner's popup window of choices.
+     *
+     * @return background Background drawable
+     *
+     * @attr ref android.R.styleable#Spinner_popupBackground
+     */
     public Drawable getPopupBackground() {
         return mPopup.getBackground();
     }
 
+    /**
+     * Set a vertical offset in pixels for the spinner's popup window of choices.
+     *
+     * @param pixels Vertical offset in pixels
+     *
+     * @attr ref android.R.styleable#ListPopupWindow_dropDownVerticalOffset
+     */
     public void setDropDownVerticalOffset(int pixels) {
         mPopup.setVerticalOffset(pixels);
     }
-    
+
+    /**
+     * Get the configured vertical offset in pixels for the spinner's popup window of choices.
+     *
+     * @return Vertical offset in pixels
+     *
+     * @attr ref android.R.styleable#ListPopupWindow_dropDownVerticalOffset
+     */
     public int getDropDownVerticalOffset() {
         return mPopup.getVerticalOffset();
     }
 
+    /**
+     * Set a horizontal offset in pixels for the spinner's popup window of choices.
+     *
+     * @param pixels Horizontal offset in pixels
+     *
+     * @attr ref android.R.styleable#ListPopupWindow_dropDownHorizontalOffset
+     */
     public void setDropDownHorizontalOffset(int pixels) {
         mPopup.setHorizontalOffset(pixels);
     }
-    
+
+    /**
+     * Get the configured horizontal offset in pixels for the spinner's popup window of choices.
+     *
+     * @return Horizontal offset in pixels
+     *
+     * @attr ref android.R.styleable#ListPopupWindow_dropDownHorizontalOffset
+     */
     public int getDropDownHorizontalOffset() {
         return mPopup.getHorizontalOffset();
     }
-    
+
+    /**
+     * Set the width of the spinner's popup window of choices in pixels. This value
+     * may also be set to {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT}
+     * to match the width of the Spinner itself, or
+     * {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT} to wrap to the measured size
+     * of contained dropdown list items.
+     *
+     * @param pixels Width in pixels, WRAP_CONTENT, or MATCH_PARENT
+     *
+     * @attr ref android.R.styleable#Spinner_dropDownWidth
+     */
     public void setDropDownWidth(int pixels) {
         mDropDownWidth = pixels;
     }
 
+    /**
+     * Get the configured width of the spinner's popup window of choices in pixels.
+     * The returned value may also be {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT}
+     * meaning the popup window will match the width of the Spinner itself, or
+     * {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT} to wrap to the measured size
+     * of contained dropdown list items.
+     *
+     * @return Width in pixels, WRAP_CONTENT, or MATCH_PARENT
+     *
+     * @attr ref android.R.styleable#Spinner_dropDownWidth
+     */
     public int getDropDownWidth() {
         return mDropDownWidth;
     }
@@ -358,6 +497,13 @@ public void setMinimumWidth(int minWidth) {
         super.setMinimumWidth(minWidth);
     }
 
+    /**
+     * Describes how the selected item view is positioned.
+     *
+     * @param gravity See {@link android.view.Gravity}
+     *
+     * @attr ref android.R.styleable#Spinner_gravity
+     */
     public void setGravity(int gravity) {
         if (mGravity != gravity) {
             if ((gravity & Gravity.HORIZONTAL_GRAVITY_MASK) == 0) 
@@ -405,11 +551,19 @@ public void setOnClickListener(OnClickListener l) {
 			setOnClickListener(mRippleManager);
 		}
 	}
-    
+
+    /**
+     * Set a listener that will be called when a item's view is clicked.
+     * @param l The {@link Spinner.OnItemClickListener} will be called.
+     */
     public void setOnItemClickListener(OnItemClickListener l) {
         mOnItemClickListener = l;
     }
-    
+
+    /**
+     * Set a listener that will be called when an item is selected.
+     * @param l The {@link Spinner.OnItemSelectedListener} will be called.
+     */
     public void setOnItemSelectedListener(OnItemSelectedListener l) {
         mOnItemSelectedListener = l;
     }
@@ -431,7 +585,7 @@ protected boolean verifyDrawable(Drawable who) {
     }
     
     private int getArrowDrawableWidth(){
-    	return mArrowSize + mArrowPadding * 2;
+    	return mArrowDrawable != null ? mArrowSize + mArrowPadding * 2 : 0;
     }
     
     private int getDividerDrawableHeight(){
@@ -524,13 +678,32 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 
     @Override
     protected void onLayout(boolean changed, int l, int t, int r, int b) {
-    	int childLeft = getPaddingLeft();
-		int childRight = r - l - getPaddingRight() - getArrowDrawableWidth();
+        int w = r - l;
+        int h = b - t;
+        int arrowWidth = getArrowDrawableWidth();
+
+        if(mArrowDrawable != null) {
+            int top = getPaddingTop() + (mLabelView == null ? 0 : mLabelView.getMeasuredHeight());
+            int bottom = h - getDividerDrawableHeight() - getPaddingBottom();
+            if(mIsRtl)
+                mArrowDrawable.setBounds(getPaddingLeft(), top, getPaddingLeft() + arrowWidth, bottom);
+            else
+                mArrowDrawable.setBounds(getWidth() - getPaddingRight() - arrowWidth, top, getWidth() - getPaddingRight(), bottom);
+        }
+
+        if(mDividerDrawable != null)
+            mDividerDrawable.setBounds(getPaddingLeft(), h - mDividerHeight - getPaddingBottom(), w - getPaddingRight(), h - getPaddingBottom());
+
+    	int childLeft = mIsRtl ? (getPaddingLeft() + arrowWidth) : getPaddingLeft();
+		int childRight = mIsRtl ? (w - getPaddingRight()) : (w - getPaddingRight() - arrowWidth);
 		int childTop = getPaddingTop();
-		int childBottom = b - t - getPaddingBottom();
+		int childBottom = h - getPaddingBottom();
 
         if(mLabelView != null){
-            mLabelView.layout(childLeft, childTop, childLeft + mLabelView.getMeasuredWidth(), childTop + mLabelView.getMeasuredHeight());
+            if(mIsRtl)
+                mLabelView.layout(childRight - mLabelView.getMeasuredWidth(), childTop, childRight, childTop + mLabelView.getMeasuredHeight());
+            else
+                mLabelView.layout(childLeft, childTop, childLeft + mLabelView.getMeasuredWidth(), childTop + mLabelView.getMeasuredHeight());
             childTop += mLabelView.getMeasuredHeight();
         }
 
@@ -539,7 +712,11 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
 			int x, y;
 			
 			int horizontalGravity = mGravity & Gravity.HORIZONTAL_GRAVITY_MASK;
-			
+			if(horizontalGravity == Gravity.START)
+                horizontalGravity = mIsRtl ? Gravity.RIGHT : Gravity.LEFT;
+            else if(horizontalGravity == Gravity.END)
+                horizontalGravity = mIsRtl ? Gravity.LEFT : Gravity.RIGHT;
+
 			switch (horizontalGravity) {
 				case Gravity.LEFT:
 					x = childLeft;
@@ -556,7 +733,7 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
 			}
 			
 			int verticalGravity = mGravity & Gravity.VERTICAL_GRAVITY_MASK;
-			
+
 			switch (verticalGravity) {
 				case Gravity.TOP:
 					y = childTop;
@@ -575,25 +752,21 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
 			v.layout(x, y, x + v.getMeasuredWidth(), y + v.getMeasuredHeight());
 		}		
     }
-    
-    @Override
-	protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-		mArrowDrawable.setBounds(w - getArrowDrawableWidth() - getPaddingRight(), getPaddingTop() + (mLabelView == null ? 0 : mLabelView.getMeasuredHeight()), w - getPaddingRight(), h - getDividerDrawableHeight() - getPaddingBottom());
-		if(mDividerDrawable != null)
-			mDividerDrawable.setBounds(getPaddingLeft(), h - mDividerHeight - getPaddingBottom(), w - getPaddingRight(), h - getPaddingBottom());
-	}
-    
+
     @Override
 	public void draw(@NonNull Canvas canvas) {
 		super.draw(canvas);
-		mArrowDrawable.draw(canvas);
-		if(mDividerDrawable != null)
-			mDividerDrawable.draw(canvas);		
+        if(mDividerDrawable != null)
+            mDividerDrawable.draw(canvas);
+        if(mArrowDrawable != null)
+            mArrowDrawable.draw(canvas);
 	}
     
     @Override
     protected void drawableStateChanged() {
     	super.drawableStateChanged();
+        if(mArrowDrawable != null)
+            mArrowDrawable.setState(getDrawableState());
     	if(mDividerDrawable != null)
     		mDividerDrawable.setState(getDrawableState());
     }
@@ -652,14 +825,23 @@ private void showPopup(){
                 if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
             	    lv.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
             	lv.setSelection(getSelectedItemPosition());
+                if(mArrowDrawable != null && mArrowAnimSwitchMode)
+                    lv.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+                        @Override
+                        public boolean onPreDraw() {
+                            lv.getViewTreeObserver().removeOnPreDrawListener(this);
+                            mArrowDrawable.setMode(ArrowDrawable.MODE_UP, true);
+                            return true;
+                        }
+                    });
             }
-            if(mArrowAnimSwitchMode)
-            	mArrowDrawable.setMode(ArrowDrawable.MODE_UP, true);
+
         }
 	}
 	
 	private void onPopupDismissed(){
-		mArrowDrawable.setMode(ArrowDrawable.MODE_DOWN, true);
+        if(mArrowDrawable != null)
+		    mArrowDrawable.setMode(ArrowDrawable.MODE_DOWN, true);
 	}
 		
 	private int measureContentWidth(SpinnerAdapter adapter, Drawable background) {
diff --git a/lib/src/main/java/com/rey/material/widget/Switch.java b/lib/src/main/java/com/rey/material/widget/Switch.java
index b7a8111a..064702d9 100644
--- a/lib/src/main/java/com/rey/material/widget/Switch.java
+++ b/lib/src/main/java/com/rey/material/widget/Switch.java
@@ -10,6 +10,7 @@
 import android.graphics.RectF;
 import android.graphics.Shader;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
@@ -71,7 +72,17 @@ public class Switch extends View implements Checkable {
     private static final int COLOR_SHADOW_START = 0x4C000000;
     private static final int COLOR_SHADOW_END = 0x00000000;
 
+    private boolean mIsRtl = false;
+
+    /**
+     * Interface definition for a callback to be invoked when the checked state is changed.
+     */
     public interface OnCheckedChangeListener{
+        /**
+         * Called when the checked state is changed.
+         * @param view The Switch view.
+         * @param checked The checked state.
+         */
         public void onCheckedChanged(Switch view, boolean checked);
     }
 
@@ -194,6 +205,10 @@ public void setOnClickListener(OnClickListener l) {
 		}
 	}
 
+    /**
+     * Set a listener will be called when the checked state is changed.
+     * @param listener The {@link Switch.OnCheckedChangeListener} will be called.
+     */
     public void setOnCheckedChangeListener(OnCheckedChangeListener listener){
         mOnCheckedChangeListener = listener;
     }
@@ -212,6 +227,20 @@ public void setChecked(boolean checked) {
 			startAnimation();
 	}
 
+    /**
+     * Change the checked state of this Switch immediately without showing animation.
+     * @param checked The checked state.
+     */
+    public void setCheckedImmediately(boolean checked){
+        if(mChecked != checked) {
+            mChecked = checked;
+            if(mOnCheckedChangeListener != null)
+                mOnCheckedChangeListener.onCheckedChanged(this, mChecked);
+        }
+        mThumbPosition = mChecked ? 1f : 0f;
+        invalidate();
+    }
+
 	@Override
 	public boolean isChecked() {
 		return mChecked;
@@ -222,26 +251,39 @@ public void toggle() {
 		if(isEnabled())
 			setChecked(!mChecked);
 	}
-				
+
+    @Override
+    public void onRtlPropertiesChanged(int layoutDirection) {
+        boolean rtl = layoutDirection == LAYOUT_DIRECTION_RTL;
+        if(mIsRtl != rtl) {
+            mIsRtl = rtl;
+            invalidate();
+        }
+    }
+
 	@Override
 	public boolean onTouchEvent(@NonNull MotionEvent event) {
 		super.onTouchEvent(event);
 		mRippleManager.onTouchEvent(event);
-		
+
+        float x = event.getX();
+        if(mIsRtl)
+            x = 2 * mDrawRect.centerX() - x;
+
 		switch (event.getAction()) {
 			case MotionEvent.ACTION_DOWN:
-				mMemoX = event.getX();
+				mMemoX = x;
 				mStartX = mMemoX;
 				mStartTime = SystemClock.uptimeMillis();
 				break;
 			case MotionEvent.ACTION_MOVE:
-				float offset = (event.getX() - mMemoX) / (mDrawRect.width() - mThumbRadius * 2);
+				float offset = (x - mMemoX) / (mDrawRect.width() - mThumbRadius * 2);
 				mThumbPosition = Math.min(1f, Math.max(0f, mThumbPosition + offset));
-				mMemoX = event.getX();
+				mMemoX = x;
 				invalidate();
 				break;
 			case MotionEvent.ACTION_UP:	
-				float velocity = (event.getX() - mStartX) / (SystemClock.uptimeMillis() - mStartTime) * 1000;
+				float velocity = (x - mStartX) / (SystemClock.uptimeMillis() - mStartTime) * 1000;
 				if(Math.abs(velocity) >= mFlingVelocity)
 					setChecked(velocity > 0);
 				else if((!mChecked && mThumbPosition < 0.1f) || (mChecked && mThumbPosition > 0.9f))
@@ -420,6 +462,8 @@ public void draw(@NonNull Canvas canvas) {
 		super.draw(canvas);
 
 		float x = (mDrawRect.width() - mThumbRadius * 2) * mThumbPosition + mDrawRect.left + mThumbRadius;
+        if(mIsRtl)
+            x = 2 * mDrawRect.centerX() - x;
 		float y = mDrawRect.centerY();
 				
 		getTrackPath(x, y, mThumbRadius);
diff --git a/lib/src/main/java/com/rey/material/widget/TabPageIndicator.java b/lib/src/main/java/com/rey/material/widget/TabPageIndicator.java
index 87e8cf06..e833ecfe 100644
--- a/lib/src/main/java/com/rey/material/widget/TabPageIndicator.java
+++ b/lib/src/main/java/com/rey/material/widget/TabPageIndicator.java
@@ -21,6 +21,7 @@
 import com.rey.material.R;
 import com.rey.material.drawable.RippleDrawable;
 import com.rey.material.util.ThemeUtil;
+import com.rey.material.util.ViewUtil;
 
 @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
 public class TabPageIndicator extends HorizontalScrollView implements ViewPager.OnPageChangeListener, android.view.View.OnClickListener{
@@ -31,7 +32,7 @@ public class TabPageIndicator extends HorizontalScrollView implements ViewPager.
 	private int mMode;
 	private int mTabPadding;
 	private int mTabRippleStyle;	
-	private int mTextApperance;
+	private int mTextAppearance;
 		
 	private int mIndicatorOffset;
 	private int mIndicatorWidth;
@@ -114,7 +115,7 @@ private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, i
         mTabRippleStyle = a.getResourceId(R.styleable.TabPageIndicator_tpi_tabRipple, 0);
         int indicatorColor = a.getColor(R.styleable.TabPageIndicator_tpi_indicatorColor, ThemeUtil.colorAccent(context, 0xFFFFFFFF));
         mIndicatorHeight = a.getDimensionPixelSize(R.styleable.TabPageIndicator_tpi_indicatorHeight, ThemeUtil.dpToPx(context, 2));
-        mTextApperance = a.getResourceId(R.styleable.TabPageIndicator_android_textAppearance, 0);
+        mTextAppearance = a.getResourceId(R.styleable.TabPageIndicator_android_textAppearance, 0);
         mMode = a.getInteger(R.styleable.TabPageIndicator_tpi_mode, MODE_SCROLL);
 
         a.recycle();
@@ -171,11 +172,19 @@ public void run() {
         
         post(mTabAnimSelector);
     }
-    
+
+    /**
+     * Set a listener will be called when the current page is changed.
+     * @param listener The {@link android.support.v4.view.ViewPager.OnPageChangeListener} will be called.
+     */
 	public void setOnPageChangeListener(ViewPager.OnPageChangeListener listener) {
         mListener = listener;
     }
-    
+
+    /**
+     * Set the ViewPager associate with this indicator view.
+     * @param view The ViewPager view.
+     */
     public void setViewPager(ViewPager view) {
         if (mViewPager == view) 
             return;
@@ -198,7 +207,12 @@ public void setViewPager(ViewPager view) {
         
         notifyDataSetChanged();
     }
-    
+
+    /**
+     * Set the ViewPager associate with this indicator view and the current position;
+     * @param view The ViewPager view.
+     * @param initialPosition The current position.
+     */
     public void setViewPager(ViewPager view, int initialPosition) {
     	setViewPager(view);
         setCurrentItem(initialPosition);
@@ -270,7 +284,11 @@ public void onClick(android.view.View v) {
 		
 		mViewPager.setCurrentItem(position, true);
 	}
-	
+
+    /**
+     * Set the current page of this TabPageIndicator.
+     * @param position The position of current page.
+     */
 	public void setCurrentItem(int position) {
 		if(mSelectedPosition != position){
 			CheckedTextView tv = getTabView(mSelectedPosition);	
@@ -304,17 +322,13 @@ private void notifyDataSetChanged() {
             tv.setCheckMarkDrawable(null);
             tv.setText(title);
             tv.setGravity(Gravity.CENTER);
-            tv.setTextAppearance(getContext(), mTextApperance);
+            tv.setTextAppearance(getContext(), mTextAppearance);
             tv.setSingleLine(true);
             tv.setEllipsize(TruncateAt.END);
             tv.setOnClickListener(this);
             tv.setTag(i);
-            if(mTabRippleStyle > 0){
-            	if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
-            		tv.setBackground(new RippleDrawable.Builder(getContext(), mTabRippleStyle).build());
-				else
-					tv.setBackgroundDrawable(new RippleDrawable.Builder(getContext(), mTabRippleStyle).build());
-            }					
+            if(mTabRippleStyle > 0)
+                ViewUtil.setBackground(tv, new RippleDrawable.Builder(getContext(), mTabRippleStyle).build());
             	
             if(mMode == MODE_SCROLL){
             	tv.setPadding(mTabPadding, 0, mTabPadding, 0);
@@ -362,7 +376,7 @@ else if (i == 2)
             tv.setCheckMarkDrawable(null);
             tv.setText(title);
             tv.setGravity(Gravity.CENTER);
-            tv.setTextAppearance(getContext(), mTextApperance);
+            tv.setTextAppearance(getContext(), mTextAppearance);
             tv.setSingleLine(true);
             tv.setEllipsize(TruncateAt.END);
             tv.setTag(i);
diff --git a/lib/src/main/java/com/rey/material/widget/TimePicker.java b/lib/src/main/java/com/rey/material/widget/TimePicker.java
index 659e6521..82eaddf1 100644
--- a/lib/src/main/java/com/rey/material/widget/TimePicker.java
+++ b/lib/src/main/java/com/rey/material/widget/TimePicker.java
@@ -11,6 +11,7 @@
 import android.os.Parcelable;
 import android.os.SystemClock;
 import android.support.annotation.NonNull;
+import android.text.format.DateFormat;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
@@ -55,11 +56,7 @@ public class TimePicker extends View{
 
     private float[] mLocations = new float[72];
     private Rect mRect;
-    private static final String[] TICKS = new String[]{
-            "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12",
-            "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "00",
-            "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "00"
-    };
+    private String[] mTicks;
 
     private int mMode = MODE_HOUR;
 
@@ -71,12 +68,29 @@ public class TimePicker extends View{
 
     private boolean mEdited = false;
 
+    /**
+     * Interface definition for a callback to be invoked when the selected time is changed.
+     */
     public interface OnTimeChangedListener{
 
+        /**
+         * Called when the select mode is changed
+         * @param mode The current mode. Can be {@link #MODE_HOUR} or {@link #MODE_MINUTE}.
+         */
         public void onModeChanged(int mode);
 
+        /**
+         * Called then the selected hour is changed.
+         * @param oldValue The old hour value.
+         * @param newValue The new hour value.
+         */
         public void onHourChanged(int oldValue, int newValue);
 
+        /**
+         * Called then the selected minute is changed.
+         * @param oldValue The old minute value.
+         * @param newValue The new minute value.
+         */
         public void onMinuteChanged(int oldValue, int newValue);
     }
 
@@ -110,10 +124,29 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr, int def
         mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
         mRect = new Rect();
 
+        initTickLabels();
+
         setWillNotDraw(false);
         applyStyle(context, attrs, defStyleAttr, defStyleRes);
     }
 
+    /**
+     * Init the localized label of ticks. The value of ticks in order:
+     * 1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12",
+     * "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "0",
+     * "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "0"
+     */
+    private void initTickLabels(){
+        String format = "%2d";
+        mTicks = new String[36];
+        for(int i = 0; i < 23; i++)
+            mTicks[i] = String.format(format, i + 1);
+        mTicks[23] = String.format(format, 0);
+        mTicks[35] = mTicks[23];
+        for(int i = 24; i < 35; i++)
+            mTicks[i] = String.format(format, (i - 23) * 5);
+    }
+
     public void applyStyle(int styleId){
         applyStyle(getContext(), null, 0, styleId);
     }
@@ -133,7 +166,10 @@ private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, i
         resId = a.getResourceId(R.styleable.TimePicker_tp_outInterpolator, 0);
         mOutInterpolator = resId == 0 ? new DecelerateInterpolator() : AnimationUtils.loadInterpolator(context, resId);
         setMode(a.getInteger(R.styleable.TimePicker_tp_mode, mMode), false);
-        set24Hour(a.getBoolean(R.styleable.TimePicker_tp_24Hour, m24Hour));
+        if(a.hasValue(R.styleable.TimePicker_tp_24Hour))
+            set24Hour(a.getBoolean(R.styleable.TimePicker_tp_24Hour, m24Hour));
+        else
+            set24Hour(DateFormat.is24HourFormat(context));
         setHour(a.getInteger(R.styleable.TimePicker_tp_hour, mHour));
         setMinute(a.getInteger(R.styleable.TimePicker_tp_minute, mMinute));
 
@@ -181,22 +217,39 @@ public Interpolator getOutInterpolator(){
         return mOutInterpolator;
     }
 
+    /**
+     * @return The current select mode. Can be {@link #MODE_HOUR} or {@link #MODE_MINUTE}.
+     */
     public int getMode(){
         return mMode;
     }
 
+    /**
+     * @return The selected hour value.
+     */
     public int getHour(){
         return mHour;
     }
 
+    /**
+     * @return The selected minute value.
+     */
     public int getMinute(){
         return mMinute;
     }
 
+    /**
+     * @return this TimePicker use 24-hour format or not.
+     */
     public boolean is24Hour(){
         return m24Hour;
     }
 
+    /**
+     * Set the select mode of this TimePicker.
+     * @param mode The select mode. Can be {@link #MODE_HOUR} or {@link #MODE_MINUTE}.
+     * @param animation Indicate that should show animation when switch select mode or not.
+     */
     public void setMode(int mode, boolean animation){
         if(mMode != mode){
             mMode = mode;
@@ -211,6 +264,10 @@ public void setMode(int mode, boolean animation){
         }
     }
 
+    /**
+     * Set the selected hour value.
+     * @param hour The selected hour value.
+     */
     public void setHour(int hour){
         if(m24Hour)
             hour = Math.max(hour, 0) % 24;
@@ -229,6 +286,10 @@ public void setHour(int hour){
         }
     }
 
+    /**
+     * Set the selected minute value.
+     * @param minute The selected minute value.
+     */
     public void setMinute(int minute){
         minute = Math.min(Math.max(minute, 0), 59);
 
@@ -244,10 +305,18 @@ public void setMinute(int minute){
         }
     }
 
+    /**
+     * Set a listener will be called when the selected time is changed.
+     * @param listener The {@link TimePicker.OnTimeChangedListener} will be called.
+     */
     public void setOnTimeChangedListener(OnTimeChangedListener listener){
         mOnTimeChangedListener = listener;
     }
 
+    /**
+     * Set this TimePicker use 24-hour format or not.
+     * @param b
+     */
     public void set24Hour(boolean b){
         if(m24Hour != b){
             m24Hour = b;
@@ -309,7 +378,7 @@ private void calculateTextLocation(){
 
         if(m24Hour){
             for(int i = 0; i < 12; i++){
-                mPaint.getTextBounds(TICKS[i], 0, TICKS[i].length(), mRect);
+                mPaint.getTextBounds(mTicks[i], 0, mTicks[i].length(), mRect);
                 if(i == 0)
                     mSecondInnerRadius = mInnerRadius - mSelectionRadius - mRect.height();
 
@@ -322,11 +391,11 @@ private void calculateTextLocation(){
                 angle += step;
             }
 
-            for(int i = 12; i < TICKS.length; i++){
+            for(int i = 12; i < mTicks.length; i++){
                 x = mCenterPoint.x + (float)Math.cos(angle) * mInnerRadius;
                 y = mCenterPoint.y + (float)Math.sin(angle) * mInnerRadius;
 
-                mPaint.getTextBounds(TICKS[i], 0, TICKS[i].length(), mRect);
+                mPaint.getTextBounds(mTicks[i], 0, mTicks[i].length(), mRect);
                 mLocations[i * 2] = x;
                 mLocations[i * 2 + 1] = y + mRect.height() / 2f;
 
@@ -338,18 +407,18 @@ private void calculateTextLocation(){
                 x = mCenterPoint.x + (float)Math.cos(angle) * mInnerRadius;
                 y = mCenterPoint.y + (float)Math.sin(angle) * mInnerRadius;
 
-                mPaint.getTextBounds(TICKS[i], 0, TICKS[i].length(), mRect);
+                mPaint.getTextBounds(mTicks[i], 0, mTicks[i].length(), mRect);
                 mLocations[i * 2] = x;
                 mLocations[i * 2 + 1] = y + mRect.height() / 2f;
 
                 angle += step;
             }
 
-            for(int i = 24; i < TICKS.length; i++){
+            for(int i = 24; i < mTicks.length; i++){
                 x = mCenterPoint.x + (float)Math.cos(angle) * mInnerRadius;
                 y = mCenterPoint.y + (float)Math.sin(angle) * mInnerRadius;
 
-                mPaint.getTextBounds(TICKS[i], 0, TICKS[i].length(), mRect);
+                mPaint.getTextBounds(mTicks[i], 0, mTicks[i].length(), mRect);
                 mLocations[i * 2] = x;
                 mLocations[i * 2 + 1] = y + mRect.height() / 2f;
 
@@ -510,7 +579,7 @@ public void draw(Canvas canvas) {
             for(int i = 0; i < length; i++) {
                 index = start + i;
                 mPaint.setColor(index == selectedTick ? mTextHighlightColor : mTextColor);
-                canvas.drawText(TICKS[index], mLocations[index * 2], mLocations[index * 2 + 1], mPaint);
+                canvas.drawText(mTicks[index], mLocations[index * 2], mLocations[index * 2 + 1], mPaint);
             }
         }
         else{
@@ -601,7 +670,7 @@ public void draw(Canvas canvas) {
                 x = mLocations[index * 2] + (float)Math.cos(angle) * outOffset;
                 y = mLocations[index * 2 + 1] + (float)Math.sin(angle) * outOffset;
                 mPaint.setColor(index == outSelectedTick ? textHighlightOutColor : textOutColor);
-                canvas.drawText(TICKS[index], x, y, mPaint);
+                canvas.drawText(mTicks[index], x, y, mPaint);
                 angle += step;
             }
 
@@ -610,7 +679,7 @@ public void draw(Canvas canvas) {
                 x = mLocations[index * 2] + (float)Math.cos(angle) * inOffset;
                 y = mLocations[index * 2 + 1] + (float)Math.sin(angle) * inOffset;
                 mPaint.setColor(index == inSelectedTick ? textHighlightInColor : textInColor);
-                canvas.drawText(TICKS[index], x, y, mPaint);
+                canvas.drawText(mTicks[index], x, y, mPaint);
                 angle += step;
             }
         }
diff --git a/lib/src/main/java/com/rey/material/widget/YearPicker.java b/lib/src/main/java/com/rey/material/widget/YearPicker.java
index 9f530c90..1531a18c 100644
--- a/lib/src/main/java/com/rey/material/widget/YearPicker.java
+++ b/lib/src/main/java/com/rey/material/widget/YearPicker.java
@@ -6,6 +6,7 @@
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Typeface;
+import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.annotation.NonNull;
@@ -48,8 +49,16 @@ public class YearPicker extends ListView{
 
     private Paint mPaint;
 
+    /**
+     * Interface definition for a callback to be invoked when the selected year is changed.
+     */
     public interface OnYearChangedListener{
 
+        /**
+         * Called then the selected year is changed.
+         * @param oldValue The old year value.
+         * @param newValue The new year value.
+         */
         public void onYearChanged(int oldValue, int newValue);
 
     }
@@ -63,6 +72,8 @@ public interface OnYearChangedListener{
 
     private int[] mTextColors = new int[2];
 
+    private static final String YEAR_FORMAT = "%4d";
+
     public YearPicker(Context context) {
         super(context);
 
@@ -152,10 +163,19 @@ private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, i
         mAdapter.notifyDataSetChanged();
     }
 
+    /**
+     * Set the range of selectable year value.
+     * @param min The minimum selectable year value.
+     * @param max The maximum selectable year value.
+     */
     public void setYearRange(int min, int max){
         mAdapter.setYearRange(min, max);
     }
 
+    /**
+     * Jump to a specific year.
+     * @param year
+     */
     public void goTo(int year){
         int position = mAdapter.positionOfYear(year) - mPositionShift;
         int offset = mDistanceShift;
@@ -176,6 +196,10 @@ public void run() {
         });
     }
 
+    /**
+     * Set the selected year.
+     * @param year The selected year value.
+     */
     public void setYear(int year){
         if(mAdapter.getYear() == year)
             return;
@@ -184,10 +208,17 @@ public void setYear(int year){
         goTo(year);
     }
 
+    /**
+     * @return The selected year value.
+     */
     public int getYear(){
         return mAdapter.getYear();
     }
 
+    /**
+     * Set a listener will be called when the selected year value is changed.
+     * @param listener The {@link YearPicker.OnYearChangedListener} will be called.
+     */
     public void setOnYearChangedListener(OnYearChangedListener listener){
         mOnYearChangedListener = listener;
     }
@@ -306,6 +337,8 @@ public View getView(int position, View convertView, ViewGroup parent) {
             if(v == null){
                 v = new CircleCheckedTextView(getContext());
                 v.setGravity(Gravity.CENTER);
+                if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
+                    v.setTextAlignment(TEXT_ALIGNMENT_CENTER);
                 v.setMinHeight(mItemRealHeight);
                 v.setMaxHeight(mItemRealHeight);
                 v.setAnimDuration(mAnimDuration);
@@ -319,7 +352,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
             int year = (Integer)getItem(position);
             v.setTag(year);
-            v.setText(String.valueOf(year));
+            v.setText(String.format(YEAR_FORMAT, year));
             v.setCheckedImmediately(year == mCurYear);
             return v;
         }
diff --git a/lib/src/main/res/values/attrs.xml b/lib/src/main/res/values/attrs.xml
index c30d8e2a..085a6886 100644
--- a/lib/src/main/res/values/attrs.xml
+++ b/lib/src/main/res/values/attrs.xml
@@ -65,6 +65,9 @@
         <attr name="pv_autostart" format="boolean"/> 
         <attr name="pv_circular" format="boolean"/> 
         <attr name="pv_progressStyle" format="reference"/>
+        <attr name="pv_progressMode"/>
+        <attr name="pv_progress" />
+        <attr name="pv_secondaryProgress" />
     </declare-styleable>
         
     <declare-styleable name="RippleView">
@@ -100,7 +103,11 @@
         <attr name="rd_topPadding" format="reference|dimension"/>
         <attr name="rd_rightPadding" format="reference|dimension"/>
         <attr name="rd_bottomPadding" format="reference|dimension"/>
-        <attr name="rd_delayClick" format="boolean"/>
+        <attr name="rd_delayClick" format="integer">
+            <enum name="none" value="0x00000000" />
+            <enum name="untilRelease" value="0x00000001" />
+            <enum name="afterRelease" value="0x00000002" />
+        </attr>
     </declare-styleable>
     
     <declare-styleable name="LineMorphingDrawable">
@@ -126,6 +133,11 @@
 	        <enum name="bevel" value="0x00000002" />
         </attr>
         <attr name="lmd_clockwise" format="boolean"/>
+        <attr name="lmd_layoutDirection" format="integer">
+            <enum name="ltr" value="0x00000000" />
+            <enum name="rtl" value="0x00000001" />
+            <enum name="locale" value="0x00000003" />
+        </attr>
     </declare-styleable>
     
     <declare-styleable name="RadioButtonDrawable">
@@ -284,7 +296,7 @@
         </attr>
         <attr name="sb_minHeight" format="reference|dimension"/>
         <attr name="sb_maxHeight" format="reference|dimension"/>
-        <attr name="sb_marginLeft" format="reference|dimension"/>
+        <attr name="sb_marginStart" format="reference|dimension"/>
         <attr name="sb_marginBottom" format="reference|dimension"/>
         <attr name="sb_textSize" format="reference|dimension"/>
         <attr name="sb_textColor" format="reference|color"/>
@@ -361,6 +373,11 @@
         <attr name="di_elevation" format="dimension|reference" />
         <attr name="di_maxElevation" format="dimension|reference" />
         <attr name="di_cornerRadius" format="dimension|reference" />
+        <attr name="di_layoutDirection" format="integer">
+            <enum name="ltr" value="0" />
+            <enum name="rtl" value="1" />
+            <enum name="locale" value="3" />
+        </attr>
         <attr name="di_titleTextAppearance" format="reference" />
         <attr name="di_titleTextColor" format="color|reference" />
         <attr name="di_actionBackground" format="reference" />
@@ -429,6 +446,7 @@
         <attr name="tp_textTimeSize" format="dimension|reference" />
         <attr name="tp_am" format="string|reference"/>
         <attr name="tp_pm" format="string|reference"/>
+        <attr name="tp_leadingZero" format="boolean|reference"/>
     </declare-styleable>
 
     <attr name="dp_textHighlightColor" format="color|reference" />
diff --git a/lib/src/main/res/values/styles.xml b/lib/src/main/res/values/styles.xml
index 7558aade..0a03dc8a 100644
--- a/lib/src/main/res/values/styles.xml
+++ b/lib/src/main/res/values/styles.xml
@@ -107,7 +107,7 @@
         <item name="rd_maskType">rectangle</item>
         <item name="rd_cornerRadius">2dp</item>
         <item name="rd_padding">0dp</item>
-        <item name="rd_delayClick">false</item>
+        <item name="rd_delayClick">none</item>
     </style>
 
     <style name="Material.Drawable.Ripple.Touch" parent="Material.Drawable.Ripple">
@@ -156,6 +156,7 @@
         <item name="lmd_strokeCap">butt</item>
         <item name="lmd_strokeJoin">miter</item>
         <item name="lmd_clockwise">true</item>
+        <item name="lmd_layoutDirection">locale</item>
     </style>
 
     <style name="Material.Drawable.NavigationDrawerIcon.Light" parent="Material.Drawable.NavigationDrawerIcon">
@@ -276,7 +277,7 @@
     </style>
 
     <style name="Material.Widget.SnackBar.Mobile" parent="Material.Widget.SnackBar">
-        <item name="sb_marginLeft">0dp</item>
+        <item name="sb_marginStart">0dp</item>
         <item name="sb_marginBottom">0dp</item>
         <item name="sb_width">match_parent</item>
         <item name="sb_height">48dp</item>
@@ -292,7 +293,7 @@
     </style>
 
     <style name="Material.Widget.SnackBar.Tablet" parent="Material.Widget.SnackBar">
-        <item name="sb_marginLeft">16dp</item>
+        <item name="sb_marginStart">16dp</item>
         <item name="sb_marginBottom">16dp</item>
         <item name="sb_width">wrap_content</item>
         <item name="sb_height">48dp</item>
@@ -318,6 +319,7 @@
         <item name="di_elevation">4dp</item>
         <item name="di_maxElevation">4dp</item>
         <item name="di_cornerRadius">2dp</item>
+        <item name="di_layoutDirection">locale</item>
         <item name="di_titleTextAppearance">@style/TextAppearance.AppCompat.Title</item>
         <item name="di_titleTextColor">@color/abc_primary_text_material_dark</item>
         <item name="di_actionRipple">@style/Material.Drawable.Ripple.Wave</item>
@@ -397,6 +399,7 @@
         <item name="tp_headerHeight">120dp</item>
         <item name="tp_textTimeSize">@dimen/abc_text_size_display_2_material</item>
         <item name="tp_textTimeColor">#90FFFFFF</item>
+        <item name="tp_leadingZero">false</item>
     </style>
 
     <style name="Material.App.Dialog.TimePicker.Light" parent="Material.App.Dialog.Light">
@@ -415,6 +418,7 @@
         <item name="tp_headerHeight">120dp</item>
         <item name="tp_textTimeSize">@dimen/abc_text_size_display_2_material</item>
         <item name="tp_textTimeColor">#90FFFFFF</item>
+        <item name="tp_leadingZero">false</item>
     </style>
 
     <style name="Material.Widget.YearPicker">