diff --git a/app/src/main/java/com/github/gfranks/collapsible/calendar/sample/MainActivity.java b/app/src/main/java/com/github/gfranks/collapsible/calendar/sample/MainActivity.java
index b204d6a..2097073 100644
--- a/app/src/main/java/com/github/gfranks/collapsible/calendar/sample/MainActivity.java
+++ b/app/src/main/java/com/github/gfranks/collapsible/calendar/sample/MainActivity.java
@@ -29,6 +29,8 @@ protected void onCreate(Bundle savedInstanceState) {
         mCalendarView = (CollapsibleCalendarView) findViewById(R.id.calendar);
         mListView = (ListView) findViewById(R.id.calendar_event_list);
 
+        mCalendarView.setMaxDate(LocalDate.now());
+        mCalendarView.setMinDate(LocalDate.now().minusYears(1));
         mCalendarView.setListener(this);
         mCalendarView.addEvents(getEvents());
     }
@@ -36,7 +38,7 @@ protected void onCreate(Bundle savedInstanceState) {
     private List<Event> getEvents() {
         List<Event> events = new ArrayList<>();
         for (int i=0; i<20; i++) {
-            events.add(new Event("Event " + (i+1), System.currentTimeMillis() + (86400000 * i)));
+            events.add(new Event("Event " + (i+1), System.currentTimeMillis() - (86400000 * i)));
         }
         return events;
     }
@@ -51,6 +53,8 @@ public void onDateSelected(LocalDate date, List<Event> events) {
         }
     }
 
+
+
     @Override
     public void onMonthChanged(LocalDate date) {
     }
diff --git a/build.gradle b/build.gradle
index bed51fb..ed9d60e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:2.2.2'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 79e9b0d..7a526a9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Aug 18 16:15:51 EDT 2015
+#Wed Nov 02 16:30:15 CDT 2016
 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.14.1-all.zip
diff --git a/library/src/main/java/com/github/gfranks/collapsible/calendar/CollapsibleCalendarView.java b/library/src/main/java/com/github/gfranks/collapsible/calendar/CollapsibleCalendarView.java
index 39ace4c..48eb0f0 100644
--- a/library/src/main/java/com/github/gfranks/collapsible/calendar/CollapsibleCalendarView.java
+++ b/library/src/main/java/com/github/gfranks/collapsible/calendar/CollapsibleCalendarView.java
@@ -66,7 +66,7 @@ public class CollapsibleCalendarView extends LinearLayout implements View.OnClic
     private ResizeManager mResizeManager;
     private boolean mInitialized;
     private final GestureDetector mGestureDetector;
-
+    CollapsibleState startingState = CollapsibleState.MONTH;
     public CollapsibleCalendarView(Context context) {
         this(context, null);
     }
@@ -78,7 +78,7 @@ public CollapsibleCalendarView(Context context, AttributeSet attrs) {
     public CollapsibleCalendarView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
 
-        CollapsibleState startingState = CollapsibleState.MONTH;
+
         if (attrs != null) {
             TypedArray typedArray = context.getTheme().obtainStyledAttributes(attrs, R.styleable.CollapsibleCalendarView, 0, 0);
             try {
@@ -252,6 +252,7 @@ public LocalDate getMinDate() {
 
     public void setMinDate(LocalDate minDate) {
         getManager().setMinDate(minDate);
+        reload_manager();
     }
 
     public LocalDate getMaxDate() {
@@ -260,6 +261,7 @@ public LocalDate getMaxDate() {
 
     public void setMaxDate(LocalDate maxDate) {
         getManager().setMaxDate(maxDate);
+        reload_manager();
     }
 
     public void setTitle(String text) {
@@ -619,6 +621,14 @@ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float ve
         }
     }
 
+
+    private void reload_manager(){
+        if (mManager != null) {
+            mManager = new CalendarManager(LocalDate.now(), startingState, getManager().getMinDate(), getManager().getMaxDate());
+
+        }
+    }
+
     private class RecycleBin {
         private final Queue<View> mViews = new LinkedList<>();