diff --git a/library/FlipCheckBox/.classpath b/library/FlipCheckBox/.classpath
index 7bc01d9..b3759cb 100644
--- a/library/FlipCheckBox/.classpath
+++ b/library/FlipCheckBox/.classpath
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
+	<classpathentry kind="lib" path="libs/nineoldandroids-2.4.0.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/library/FlipCheckBox/res/layout/flipcheckbox_view.xml b/library/FlipCheckBox/res/layout/flipcheckbox_view.xml
index b76e3fc..a1b9c10 100644
--- a/library/FlipCheckBox/res/layout/flipcheckbox_view.xml
+++ b/library/FlipCheckBox/res/layout/flipcheckbox_view.xml
@@ -1,17 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <ViewFlipper
-        android:id="@+id/viewFlipper"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
 
-        <include android:id="@+id/inclide_front" layout="@layout/simple_card_front" />
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/viewFlipper"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
 
-        <include android:id="@+id/inclide_back" layout="@layout/simple_card_back" />
-    </ViewFlipper>
+    <include android:id="@+id/inclide_front" layout="@layout/simple_card_front" />
 
-</LinearLayout>
\ No newline at end of file
+    <include android:id="@+id/inclide_back" layout="@layout/simple_card_back" />
+</merge>
diff --git a/library/FlipCheckBox/res/layout/simple_card_back.xml b/library/FlipCheckBox/res/layout/simple_card_back.xml
index 6998d53..620017d 100644
--- a/library/FlipCheckBox/res/layout/simple_card_back.xml
+++ b/library/FlipCheckBox/res/layout/simple_card_back.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="16dp"
@@ -9,9 +9,9 @@
         android:id="@+id/iv__card_back__ok"
         android:layout_width="60dp"
         android:layout_height="60dp"
-        android:layout_centerInParent="true"
+        android:layout_gravity="center"
         android:contentDescription="@null"
         android:gravity="center_horizontal"
         android:src="@drawable/ic_action_accept" />
 
-</RelativeLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/library/FlipCheckBox/res/layout/simple_card_front.xml b/library/FlipCheckBox/res/layout/simple_card_front.xml
index 3bab67c..b7bcdf9 100644
--- a/library/FlipCheckBox/res/layout/simple_card_front.xml
+++ b/library/FlipCheckBox/res/layout/simple_card_front.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/darker_gray"
     android:orientation="vertical" >
 
-</LinearLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/library/FlipCheckBox/src/com/franlopez/flipcheckbox/FlipCheckBox.java b/library/FlipCheckBox/src/com/franlopez/flipcheckbox/FlipCheckBox.java
index 97451fb..ea1b693 100644
--- a/library/FlipCheckBox/src/com/franlopez/flipcheckbox/FlipCheckBox.java
+++ b/library/FlipCheckBox/src/com/franlopez/flipcheckbox/FlipCheckBox.java
@@ -10,7 +10,6 @@
 import android.view.View;
 import android.view.animation.AnimationUtils;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.ViewFlipper;
 
 /**
@@ -26,7 +25,7 @@
 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
 	and limitations under the License.
  */
-public class FlipCheckBox extends LinearLayout {
+public class FlipCheckBox extends ViewFlipper {
 
 	/**
 	 * Status available
@@ -88,7 +87,7 @@ public FlipCheckBox(Context context, AttributeSet attrs) {
 	
 	private void getView(View view) {
 		
-		mViewFlipper = (ViewFlipper) view.findViewById(R.id.viewFlipper);
+		mViewFlipper = (ViewFlipper) view;
 		mIVOk = (ImageView) mViewFlipper.findViewById(R.id.inclide_back).findViewById(R.id.iv__card_back__ok);
 	}
 	
diff --git a/sample/Demo FlipCheckBox/.classpath b/sample/Demo FlipCheckBox/.classpath
index 6fb55e1..86afa20 100644
--- a/sample/Demo FlipCheckBox/.classpath	
+++ b/sample/Demo FlipCheckBox/.classpath	
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="lib" path="libs/android-support-v7-appcompat.jar"/>
 	<classpathentry kind="lib" path="libs/picasso-2.3.2.jar"/>
-	<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/android-support-v7-appcompat"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/sample/Demo FlipCheckBox/libs/android-support-v4.jar b/sample/Demo FlipCheckBox/libs/android-support-v4.jar
deleted file mode 100644
index 187bdf4..0000000
Binary files a/sample/Demo FlipCheckBox/libs/android-support-v4.jar and /dev/null differ
diff --git a/sample/Demo FlipCheckBox/libs/android-support-v7-appcompat.jar b/sample/Demo FlipCheckBox/libs/android-support-v7-appcompat.jar
deleted file mode 100644
index fd1d984..0000000
Binary files a/sample/Demo FlipCheckBox/libs/android-support-v7-appcompat.jar and /dev/null differ
diff --git a/sample/Demo FlipCheckBox/project.properties b/sample/Demo FlipCheckBox/project.properties
index 1989a62..4816e1a 100644
--- a/sample/Demo FlipCheckBox/project.properties	
+++ b/sample/Demo FlipCheckBox/project.properties	
@@ -13,4 +13,4 @@
 # Project target.
 target=android-19
 android.library.reference.1=../../library/FlipCheckBox
-android.library.reference.2=../../../../adt-bundle-mac-x86_64-ultima-version/sdk/extras/android/support/v7/appcompat
+android.library.reference.2=../../../android-sdk/extras/android/support/v7/appcompat