diff --git a/README.md b/README.md
index 0932888..a02102b 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Step 2: Add this to your module `build.gradle` file:
 
     dependencies {
       ...
-        compile 'com.github.simonebortolin:Bubble-Picker:0.3.0'
+        compile 'com.github.simonebortolin:Bubble-Picker:0.3.1'
     }
 
 
diff --git a/bubblepicker/src/main/java/com/igalata/bubblepicker/rendering/BubblePicker.kt b/bubblepicker/src/main/java/com/igalata/bubblepicker/rendering/BubblePicker.kt
index f8364f0..79c39cc 100644
--- a/bubblepicker/src/main/java/com/igalata/bubblepicker/rendering/BubblePicker.kt
+++ b/bubblepicker/src/main/java/com/igalata/bubblepicker/rendering/BubblePicker.kt
@@ -57,13 +57,16 @@ class BubblePicker @JvmOverloads constructor(context: Context?, attrs: Attribute
     val selectedItems: List<PickerItem?>
         get() = renderer.selectedItems
 
-    var centerImmediately = false
+    var centerImmediately = true
         set(value) {
             if (mode == SPACE_INFINITE) {
                 field = value
                 renderer.centerImmediately = value
             } else throw UnSupportedActionPickerException()
         }
+
+    var enableSwipe = true
+
     private var renderer: PickerRenderer
     private var startX = 0f
     private var startY = 0f
@@ -108,17 +111,21 @@ class BubblePicker @JvmOverloads constructor(context: Context?, attrs: Attribute
                 previousY = event.y
             }
             MotionEvent.ACTION_UP -> {
-                if (mode == SPACE_INFINITE) {
-                    if (isClick(event)) renderer.resize(event.x, event.y)
-                    renderer.release()
-                } else if (mode == SPACE_FINITE) {
-                    if (isClick(event) && !isTooFast()) renderer.resize(event.x, event.y)
-                    previousUpTime = System.currentTimeMillis()
-                    renderer.release()
+                when (mode) {
+                    SPACE_INFINITE -> {
+                        if (isClick(event)) renderer.resize(event.x, event.y)
+                        renderer.release()
+                    }
+                    SPACE_FINITE -> {
+                        if (isClick(event) && !isTooFast()) renderer.resize(event.x, event.y)
+                        previousUpTime = System.currentTimeMillis()
+                        renderer.release()
+                    }
+                    else -> release()
                 }
             }
             MotionEvent.ACTION_MOVE -> {
-                if ((isSwipe(event)) && (mode == SPACE_INFINITE)) {
+                if (mode == SPACE_INFINITE && isSwipe(event) && enableSwipe) {
                     renderer.swipe(previousX - event.x, previousY - event.y)
                     previousX = event.x
                     previousY = event.y
@@ -150,6 +157,14 @@ class BubblePicker @JvmOverloads constructor(context: Context?, attrs: Attribute
         if (array.hasValue(R.styleable.BubblePicker_backgroundColor)) {
             background = array.getColor(R.styleable.BubblePicker_backgroundColor, -1)
         }
+
+        if (array.hasValue(R.styleable.BubblePicker_centerImmediately)) {
+            centerImmediately = array.getInt(R.styleable.BubblePicker_centerImmediately, -1) == 1
+        }
+
+        if (array.hasValue(R.styleable.BubblePicker_swipe)) {
+            enableSwipe = array.getInt(R.styleable.BubblePicker_swipe, -1) == 1
+        }
         array.recycle()
     }
 
diff --git a/bubblepicker/src/main/res/values/attrs.xml b/bubblepicker/src/main/res/values/attrs.xml
index 2c8d12c..d9e759a 100644
--- a/bubblepicker/src/main/res/values/attrs.xml
+++ b/bubblepicker/src/main/res/values/attrs.xml
@@ -7,6 +7,14 @@
             <enum name="spaceFinite" value="1" />
             <enum name="spaceInfinite" value="2" />
         </attr>
+        <attr name="swipe" format="enum">
+            <enum name="enable" value="1" />
+            <enum name="disable" value="0" />
+        </attr>
+        <attr name="centerImmediately" format="enum">
+            <enum name="enable" value="1" />
+            <enum name="disable" value="0" />
+        </attr>
 
     </declare-styleable>
 </resources>
\ No newline at end of file