diff --git a/.gitignore b/.gitignore
index 39fb081a..09b993d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
+/.idea
 .DS_Store
 /build
 /captures
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfd19b91..83e477b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # CHANGELOG
 
+# 1.0.6
+
+Fixed bug related with [issue #7](https://github.com/pchmn/MaterialChipsInput/issues/7)
+
+# 1.0.5
+
+Fixed bug related with [issue #13](https://github.com/pchmn/MaterialChipsInput/issues/13)
+
 # 1.0.4
 
 Fixed bug with `ChipView` label in v1.0.3
diff --git a/README.md b/README.md
index b0359610..802b40a2 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Implementation of Material Design [Chips](https://material.io/guidelines/compone
 <img src="https://github.com/pchmn/MaterialChipsInput/blob/master/docs/demo2.gif" alt="Demo" height="600px"/>
 
 ## Demo
-[Download sample-v1.0.4.apk](https://github.com/pchmn/MaterialChipsInput/raw/master/docs/material-chips-input-sample-v1.0.4.apk)
+[Download sample-v1.0.6.apk](https://github.com/pchmn/MaterialChipsInput/raw/master/docs/material-chips-input-sample-v1.0.6.apk)
 
 ## Setup
 
@@ -26,7 +26,7 @@ allprojects {
 In your app level build.gradle :
 ```java
 dependencies {
-    compile 'com.github.pchmn:MaterialChipsInput:1.0.4'
+    compile 'com.github.pchmn:MaterialChipsInput:1.0.6'
 }      
 ```
 <br><br>
diff --git a/docs/material-chips-input-sample-v1.0.4_2.apk b/docs/material-chips-input-sample-v1.0.4_2.apk
deleted file mode 100644
index e3693754..00000000
Binary files a/docs/material-chips-input-sample-v1.0.4_2.apk and /dev/null differ
diff --git a/docs/material-chips-input-sample-v1.0.4_4.apk b/docs/material-chips-input-sample-v1.0.4_4.apk
deleted file mode 100644
index 289008a3..00000000
Binary files a/docs/material-chips-input-sample-v1.0.4_4.apk and /dev/null differ
diff --git a/docs/material-chips-input-sample-v1.0.4_3.apk b/docs/material-chips-input-sample-v1.0.6.apk
similarity index 53%
rename from docs/material-chips-input-sample-v1.0.4_3.apk
rename to docs/material-chips-input-sample-v1.0.6.apk
index 86a22011..aa53fb11 100644
Binary files a/docs/material-chips-input-sample-v1.0.4_3.apk and b/docs/material-chips-input-sample-v1.0.6.apk differ
diff --git a/library/src/main/java/com/pchmn/materialchips/adapter/ChipsAdapter.java b/library/src/main/java/com/pchmn/materialchips/adapter/ChipsAdapter.java
index 2e1083ee..6e000411 100644
--- a/library/src/main/java/com/pchmn/materialchips/adapter/ChipsAdapter.java
+++ b/library/src/main/java/com/pchmn/materialchips/adapter/ChipsAdapter.java
@@ -140,7 +140,7 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
                 if(event.getAction() == KeyEvent.ACTION_DOWN
                         && event.getKeyCode() == KeyEvent.KEYCODE_DEL) {
                     // remove last chip
-                    if(mChipList.size() > 0)
+                    if(mChipList.size() > 0 && mEditText.getText().toString().length() == 0)
                         removeChip(mChipList.size() - 1);
                 }
                 return false;