diff --git a/demo/src/main/res/layout/activity_main.xml b/demo/src/main/res/layout/activity_main.xml
index 9e1f049..14e8a0b 100644
--- a/demo/src/main/res/layout/activity_main.xml
+++ b/demo/src/main/res/layout/activity_main.xml
@@ -22,7 +22,7 @@
         custom:selected_color="#0095BF"
         custom:unselected_color="#55333333"
         custom:selected_drawable="@drawable/bird"
-        custom:shape="oval"
+        custom:daimajia_slider_shape="oval"
         custom:selected_padding_left="5dp"
         custom:selected_padding_right="5dp"
         custom:unselected_padding_left="5dp"
diff --git a/library/src/main/java/com/daimajia/slider/library/Indicators/PagerIndicator.java b/library/src/main/java/com/daimajia/slider/library/Indicators/PagerIndicator.java
index b10abee..98e6acc 100644
--- a/library/src/main/java/com/daimajia/slider/library/Indicators/PagerIndicator.java
+++ b/library/src/main/java/com/daimajia/slider/library/Indicators/PagerIndicator.java
@@ -127,7 +127,7 @@ public PagerIndicator(Context context, AttributeSet attrs) {
             }
         }
 
-        int shape = attributes.getInt(R.styleable.PagerIndicator_shape, Shape.Oval.ordinal());
+        int shape = attributes.getInt(R.styleable.PagerIndicator_daimajia_slider_shape, Shape.Oval.ordinal());
         for(Shape s: Shape.values()){
             if(s.ordinal() == shape){
                 mIndicatorShape = s;
diff --git a/library/src/main/java/com/daimajia/slider/library/SliderLayout.java b/library/src/main/java/com/daimajia/slider/library/SliderLayout.java
index ba36e5e..9cb431a 100644
--- a/library/src/main/java/com/daimajia/slider/library/SliderLayout.java
+++ b/library/src/main/java/com/daimajia/slider/library/SliderLayout.java
@@ -193,6 +193,9 @@ public SliderLayout(Context context, AttributeSet attrs, int defStyle) {
         mViewPager.setOnTouchListener(new OnTouchListener() {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
+                if(mSliderAdapter.getCount() < 2){
+                    return true;
+                }
                 int action = event.getAction();
                 switch (action) {
                      case MotionEvent.ACTION_UP:
@@ -235,6 +238,11 @@ public void setCustomIndicator(PagerIndicator indicator){
 
     public <T extends BaseSliderView> void addSlider(T imageContent){
         mSliderAdapter.addSlider(imageContent);
+        if(mSliderAdapter.getCount() < 2){
+            stopAutoCycle();
+        }else{
+            if(mAutoCycle) recoverCycle();
+        }
     }
 
     private android.os.Handler mh = new android.os.Handler(){
diff --git a/library/src/main/java/com/daimajia/slider/library/Tricks/InfiniteViewPager.java b/library/src/main/java/com/daimajia/slider/library/Tricks/InfiniteViewPager.java
index 5bcc457..38bbd66 100644
--- a/library/src/main/java/com/daimajia/slider/library/Tricks/InfiniteViewPager.java
+++ b/library/src/main/java/com/daimajia/slider/library/Tricks/InfiniteViewPager.java
@@ -4,6 +4,7 @@
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
+import android.view.MotionEvent;
 
 /**
  * A {@link ViewPager} that allows pseudo-infinite paging with a wrap-around effect. Should be used with an {@link
@@ -24,4 +25,14 @@ public void setAdapter(PagerAdapter adapter) {
         super.setAdapter(adapter);
     }
 
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        if(getAdapter() != null && getAdapter() instanceof InfinitePagerAdapter){
+            InfinitePagerAdapter adapter = (InfinitePagerAdapter)getAdapter();
+            if(adapter.getRealCount() == 1){
+                return false;
+            }
+        }
+        return super.onInterceptTouchEvent(ev);
+    }
 }
\ No newline at end of file
diff --git a/library/src/main/res/layout/slider_layout.xml b/library/src/main/res/layout/slider_layout.xml
index 01fcf0d..868fb2d 100644
--- a/library/src/main/res/layout/slider_layout.xml
+++ b/library/src/main/res/layout/slider_layout.xml
@@ -14,7 +14,7 @@
         android:layout_centerHorizontal="true"
         android:paddingBottom="10dp"
         android:gravity="center"
-        custom:shape="oval"
+        custom:daimajia_slider_shape="oval"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
     <com.daimajia.slider.library.Indicators.PagerIndicator
diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
index 584d13e..1640d1d 100644
--- a/library/src/main/res/values/attrs.xml
+++ b/library/src/main/res/values/attrs.xml
@@ -42,7 +42,7 @@
             <enum name="invisible" value="1"/>
         </attr>
 
-        <attr name="shape" format="enum">
+        <attr name="daimajia_slider_shape" format="enum">
             <enum value="0" name="oval"/>
             <enum value="1" name="rect"/>
         </attr>
diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml
index f8d0ad2..1c74ee4 100644
--- a/library/src/main/res/values/styles.xml
+++ b/library/src/main/res/values/styles.xml
@@ -7,7 +7,7 @@
         <item name="android:background">@drawable/indicator_corner_bg</item>
         <item name="android:paddingLeft">2dp</item>
         <item name="android:paddingRight">2dp</item>
-        <item name="shape">oval</item>
+        <item name="daimajia_slider_shape">oval</item>
         <item name="padding_left">3dp</item>
         <item name="padding_right">3dp</item>
         <item name="padding_top">4dp</item>
@@ -27,7 +27,7 @@
         <item name="android:gravity">center</item>
         <item name="android:paddingLeft">2dp</item>
         <item name="android:paddingRight">2dp</item>
-        <item name="shape">rect</item>
+        <item name="daimajia_slider_shape">rect</item>
         <item name="padding_left">3dp</item>
         <item name="padding_right">3dp</item>
         <item name="padding_top">4dp</item>
@@ -47,7 +47,7 @@
         <item name="android:gravity">center</item>
         <item name="android:paddingLeft">2dp</item>
         <item name="android:paddingRight">2dp</item>
-        <item name="shape">oval</item>
+        <item name="daimajia_slider_shape">oval</item>
         <item name="padding_left">3dp</item>
         <item name="padding_right">3dp</item>
         <item name="padding_top">4dp</item>