diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 2828b68..16ac52a 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 99202cc..37a7509 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,30 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="5">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
-          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 432cb5f..7270573 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/PersianHorizontalDatePicker.iml" filepath="$PROJECT_DIR$/PersianHorizontalDatePicker.iml" />
+      <module fileurl="file://$PROJECT_DIR$/Persian-Horizontal-Date-Picker.iml" filepath="$PROJECT_DIR$/Persian-Horizontal-Date-Picker.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/persiandatepicker/persiandatepicker.iml" filepath="$PROJECT_DIR$/persiandatepicker/persiandatepicker.iml" />
     </modules>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/com/ratintech/behkha/persiandatepicker/MainActivity.java b/app/src/main/java/com/ratintech/behkha/persiandatepicker/MainActivity.java
index 6a62e8b..6853961 100644
--- a/app/src/main/java/com/ratintech/behkha/persiandatepicker/MainActivity.java
+++ b/app/src/main/java/com/ratintech/behkha/persiandatepicker/MainActivity.java
@@ -36,6 +36,8 @@ public void onDaySelect(YearMonth yearMonth, Day day) {
                 .hasAnimation(false) // Animation for item selection . default is false
                 .load();
 
+        
+
     }
 
 
diff --git a/persiandatepicker/src/main/java/com/ratintech/behkha/persiandatepicker/PersianDatePicker.java b/persiandatepicker/src/main/java/com/ratintech/behkha/persiandatepicker/PersianDatePicker.java
index 013036f..3ed68a0 100644
--- a/persiandatepicker/src/main/java/com/ratintech/behkha/persiandatepicker/PersianDatePicker.java
+++ b/persiandatepicker/src/main/java/com/ratintech/behkha/persiandatepicker/PersianDatePicker.java
@@ -30,6 +30,7 @@ public class PersianDatePicker extends LinearLayout implements View.OnClickListe
     private ArrayList<YearMonth> mYearMonths;
     private OnDaySelectListener mOnDaySelectListener;
     private Typeface typeface;
+    private int selectedPosition = -1;
     private float elevation = 0f;
     private float radius = 0f;
     private int selectedItemBackgroundColor = R.color.colorPrimary;
@@ -131,6 +132,7 @@ public void load(){
             return;
         setupView(mYearMonthIndex);
     }
+
     private void setupView(int index){
 
         YearMonth yearMonth = this.mYearMonths.get(index);
@@ -146,6 +148,7 @@ private void setupView(int index){
         adapter.setElevation(this.elevation);
         adapter.setRadius(this.radius);
         adapter.setAnimation(this.hasAnimation);
+        adapter.setSelectionPosition(selectedPosition);
         this.mDaysRecyclerView.setAdapter( adapter );
         final LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext() , LinearLayoutManager.HORIZONTAL , true);
         this.mDaysRecyclerView.setLayoutManager(linearLayoutManager);
@@ -176,6 +179,41 @@ private String getTitle(YearMonth yearMonth){
         return yearMonth.getYear() + " " + yearMonth.getMonth();
     }
 
+    public int setItemSelected(String date) {
+        String[] strings = date.split("-");
+        if (strings.length != 3)
+            throw new IllegalArgumentException("date must divided by -");
+        int year = Integer.valueOf(strings[0]);
+        int day = Integer.valueOf(strings[2]);
+        int index = findYearMonthIndex(year,strings[1]);
+        if (index != -1) {
+            mYearMonthIndex = index;
+            selectedPosition = findDayIndex(mYearMonths.get(index),day);
+            setupView(mYearMonthIndex);
+        }
+        return selectedPosition;
+    }
+
+    public void scrollToPosition(int pos) {
+        mDaysRecyclerView.scrollToPosition(pos);
+    }
+
+    private int findYearMonthIndex(int year,String month){
+        for (int i = 0; i < mYearMonths.size(); i++) {
+            if (mYearMonths.get(i).getYear() == year && mYearMonths.get(i).getMonthNumber().equals(month))
+                return i;
+        }
+        return -1;
+    }
+
+    private int findDayIndex(YearMonth yearMonth, int day){
+        for (int i = 0; i < yearMonth.getDays().size(); i++) {
+            if (yearMonth.getDays().get(i).getNumber() == day)
+                return i;
+        }
+        return -1;
+    }
+
     @Override
     public void onClick(View v) {
         int i = v.getId();
diff --git a/persiandatepicker/src/main/java/com/ratintech/behkha/persiandatepicker/adapters/DaysRecyclerViewAdapter.java b/persiandatepicker/src/main/java/com/ratintech/behkha/persiandatepicker/adapters/DaysRecyclerViewAdapter.java
index 6e3c7b4..480babe 100644
--- a/persiandatepicker/src/main/java/com/ratintech/behkha/persiandatepicker/adapters/DaysRecyclerViewAdapter.java
+++ b/persiandatepicker/src/main/java/com/ratintech/behkha/persiandatepicker/adapters/DaysRecyclerViewAdapter.java
@@ -159,4 +159,5 @@ public void setRadius(float radius) {
     public void setAnimation(boolean animation){
         this.hasAnimation = animation;
     }
+    public void setSelectionPosition(int selectedPosition){ this.selectedPosition = selectedPosition;}
 }