diff --git a/MaterialTabTest/.idea/compiler.xml b/MaterialTabTest/.idea/compiler.xml
index 217af47..96cc43e 100644
--- a/MaterialTabTest/.idea/compiler.xml
+++ b/MaterialTabTest/.idea/compiler.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
     <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="!?*.java" />
@@ -12,6 +11,7 @@
       <entry name="!?*.flex" />
       <entry name="!?*.kt" />
       <entry name="!?*.clj" />
+      <entry name="!?*.aj" />
     </wildcardResourcePatterns>
     <annotationProcessing>
       <profile default="true" name="Default" enabled="false">
@@ -19,5 +19,4 @@
       </profile>
     </annotationProcessing>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/MaterialTabTest/.idea/dictionaries/neokree.xml b/MaterialTabTest/.idea/dictionaries/neokree.xml
deleted file mode 100644
index 20ec442..0000000
--- a/MaterialTabTest/.idea/dictionaries/neokree.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="neokree" />
-</component>
\ No newline at end of file
diff --git a/MaterialTabTest/.idea/encodings.xml b/MaterialTabTest/.idea/encodings.xml
deleted file mode 100644
index e206d70..0000000
--- a/MaterialTabTest/.idea/encodings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
diff --git a/MaterialTabTest/.idea/gradle.xml b/MaterialTabTest/.idea/gradle.xml
index fe93ea7..8d2df47 100644
--- a/MaterialTabTest/.idea/gradle.xml
+++ b/MaterialTabTest/.idea/gradle.xml
@@ -3,18 +3,16 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/MaterialTabsModule" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
       </GradleProjectSettings>
     </option>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/MaterialTabTest/.idea/misc.xml b/MaterialTabTest/.idea/misc.xml
index 1d2cf9c..e06eb7e 100644
--- a/MaterialTabTest/.idea/misc.xml
+++ b/MaterialTabTest/.idea/misc.xml
@@ -3,13 +3,92 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="MavenImportPreferences">
+    <option name="generalSettings">
+      <MavenGeneralSettings>
+        <option name="mavenHome" value="Bundled (Maven 3)" />
+      </MavenGeneralSettings>
+    </option>
+  </component>
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
+  <component name="ProjectInspectionProfilesVisibleTreeState">
+    <entry key="Project Default">
+      <profile-state>
+        <expanded-state>
+          <State>
+            <id />
+          </State>
+          <State>
+            <id>Android</id>
+          </State>
+          <State>
+            <id>Android Lint</id>
+          </State>
+          <State>
+            <id>CorrectnessLintAndroid</id>
+          </State>
+          <State>
+            <id>Gradle</id>
+          </State>
+          <State>
+            <id>LintAndroid</id>
+          </State>
+          <State>
+            <id>Probable bugsGradle</id>
+          </State>
+        </expanded-state>
+        <selected-state>
+          <State>
+            <id>Android</id>
+          </State>
+        </selected-state>
+      </profile-state>
+    </entry>
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
   <component name="masterDetails">
     <states>
-      <state key="ScopeChooserConfigurable.UI">
+      <state key="ProjectJDKs.UI">
         <settings>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -21,5 +100,4 @@
       </state>
     </states>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/MaterialTabTest/.idea/modules.xml b/MaterialTabTest/.idea/modules.xml
index e1d31ac..68ecfb5 100644
--- a/MaterialTabTest/.idea/modules.xml
+++ b/MaterialTabTest/.idea/modules.xml
@@ -3,9 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/MaterialTabTest.iml" filepath="$PROJECT_DIR$/MaterialTabTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/MaterialTabsModule/MaterialTabsModule.iml" filepath="$PROJECT_DIR$/MaterialTabsModule/MaterialTabsModule.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/MaterialTabTest/.idea/runConfigurations.xml b/MaterialTabTest/.idea/runConfigurations.xml
new file mode 100644
index 0000000..7f68460
--- /dev/null
+++ b/MaterialTabTest/.idea/runConfigurations.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/MaterialTabTest/.idea/scopes/scope_settings.xml b/MaterialTabTest/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/MaterialTabTest/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/MaterialTabTest/.idea/vcs.xml b/MaterialTabTest/.idea/vcs.xml
index def6a6a..6c0b863 100644
--- a/MaterialTabTest/.idea/vcs.xml
+++ b/MaterialTabTest/.idea/vcs.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/MaterialTabTest/MaterialTabTest.iml b/MaterialTabTest/MaterialTabTest.iml
index 5550340..504f43f 100644
--- a/MaterialTabTest/MaterialTabTest.iml
+++ b/MaterialTabTest/MaterialTabTest.iml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="MaterialTabTest" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
         <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <output url="file://$MODULE_DIR$/build/classes/main" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
@@ -17,5 +18,4 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/MaterialTabsModule/.gitignore b/MaterialTabTest/MaterialTabsModule/.gitignore
similarity index 100%
rename from MaterialTabsModule/.gitignore
rename to MaterialTabTest/MaterialTabsModule/.gitignore
diff --git a/MaterialTabsModule/MaterialTabsModule.iml b/MaterialTabTest/MaterialTabsModule/MaterialTabsModule.iml
similarity index 84%
rename from MaterialTabsModule/MaterialTabsModule.iml
rename to MaterialTabTest/MaterialTabsModule/MaterialTabsModule.iml
index cc54116..2540632 100644
--- a/MaterialTabsModule/MaterialTabsModule.iml
+++ b/MaterialTabTest/MaterialTabsModule/MaterialTabsModule.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="MaterialTabTest" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":MaterialTabsModule" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="MaterialTabTest" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -9,11 +9,15 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
+        <afterSyncTasks>
+          <task>generateDebugSources</task>
+          <task>generateDebugTestSources</task>
+        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -23,8 +27,9 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -60,22 +65,15 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
@@ -84,10 +82,9 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="android-ui-1.2" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
+    <orderEntry type="library" exported="" name="android-ui-1.2" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-21.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/MaterialTabsModule/build.gradle b/MaterialTabTest/MaterialTabsModule/build.gradle
similarity index 100%
rename from MaterialTabsModule/build.gradle
rename to MaterialTabTest/MaterialTabsModule/build.gradle
diff --git a/MaterialTabsModule/materialtabs.iml b/MaterialTabTest/MaterialTabsModule/materialtabs.iml
similarity index 100%
rename from MaterialTabsModule/materialtabs.iml
rename to MaterialTabTest/MaterialTabsModule/materialtabs.iml
diff --git a/MaterialTabsModule/proguard-rules.pro b/MaterialTabTest/MaterialTabsModule/proguard-rules.pro
similarity index 100%
rename from MaterialTabsModule/proguard-rules.pro
rename to MaterialTabTest/MaterialTabsModule/proguard-rules.pro
diff --git a/MaterialTabsModule/src/main/AndroidManifest.xml b/MaterialTabTest/MaterialTabsModule/src/main/AndroidManifest.xml
similarity index 100%
rename from MaterialTabsModule/src/main/AndroidManifest.xml
rename to MaterialTabTest/MaterialTabsModule/src/main/AndroidManifest.xml
diff --git a/MaterialTabsModule/src/main/java/it/neokree/materialtabs/MaterialTab.java b/MaterialTabTest/MaterialTabsModule/src/main/java/it/neokree/materialtabs/MaterialTab.java
similarity index 100%
rename from MaterialTabsModule/src/main/java/it/neokree/materialtabs/MaterialTab.java
rename to MaterialTabTest/MaterialTabsModule/src/main/java/it/neokree/materialtabs/MaterialTab.java
diff --git a/MaterialTabsModule/src/main/java/it/neokree/materialtabs/MaterialTabHost.java b/MaterialTabTest/MaterialTabsModule/src/main/java/it/neokree/materialtabs/MaterialTabHost.java
similarity index 100%
rename from MaterialTabsModule/src/main/java/it/neokree/materialtabs/MaterialTabHost.java
rename to MaterialTabTest/MaterialTabsModule/src/main/java/it/neokree/materialtabs/MaterialTabHost.java
diff --git a/MaterialTabsModule/src/main/java/it/neokree/materialtabs/MaterialTabListener.java b/MaterialTabTest/MaterialTabsModule/src/main/java/it/neokree/materialtabs/MaterialTabListener.java
similarity index 100%
rename from MaterialTabsModule/src/main/java/it/neokree/materialtabs/MaterialTabListener.java
rename to MaterialTabTest/MaterialTabsModule/src/main/java/it/neokree/materialtabs/MaterialTabListener.java
diff --git a/MaterialTabsModule/src/main/res/drawable-hdpi/left_arrow.png b/MaterialTabTest/MaterialTabsModule/src/main/res/drawable-hdpi/left_arrow.png
similarity index 100%
rename from MaterialTabsModule/src/main/res/drawable-hdpi/left_arrow.png
rename to MaterialTabTest/MaterialTabsModule/src/main/res/drawable-hdpi/left_arrow.png
diff --git a/MaterialTabsModule/src/main/res/drawable-hdpi/right_arrow.png b/MaterialTabTest/MaterialTabsModule/src/main/res/drawable-hdpi/right_arrow.png
similarity index 100%
rename from MaterialTabsModule/src/main/res/drawable-hdpi/right_arrow.png
rename to MaterialTabTest/MaterialTabsModule/src/main/res/drawable-hdpi/right_arrow.png
diff --git a/MaterialTabsModule/src/main/res/drawable-mdpi/left_arrow.png b/MaterialTabTest/MaterialTabsModule/src/main/res/drawable-mdpi/left_arrow.png
similarity index 100%
rename from MaterialTabsModule/src/main/res/drawable-mdpi/left_arrow.png
rename to MaterialTabTest/MaterialTabsModule/src/main/res/drawable-mdpi/left_arrow.png
diff --git a/MaterialTabsModule/src/main/res/drawable-mdpi/right_arrow.png b/MaterialTabTest/MaterialTabsModule/src/main/res/drawable-mdpi/right_arrow.png
similarity index 100%
rename from MaterialTabsModule/src/main/res/drawable-mdpi/right_arrow.png
rename to MaterialTabTest/MaterialTabsModule/src/main/res/drawable-mdpi/right_arrow.png
diff --git a/MaterialTabsModule/src/main/res/drawable-xhdpi/left_arrow.png b/MaterialTabTest/MaterialTabsModule/src/main/res/drawable-xhdpi/left_arrow.png
similarity index 100%
rename from MaterialTabsModule/src/main/res/drawable-xhdpi/left_arrow.png
rename to MaterialTabTest/MaterialTabsModule/src/main/res/drawable-xhdpi/left_arrow.png
diff --git a/MaterialTabsModule/src/main/res/drawable-xhdpi/right_arrow.png b/MaterialTabTest/MaterialTabsModule/src/main/res/drawable-xhdpi/right_arrow.png
similarity index 100%
rename from MaterialTabsModule/src/main/res/drawable-xhdpi/right_arrow.png
rename to MaterialTabTest/MaterialTabsModule/src/main/res/drawable-xhdpi/right_arrow.png
diff --git a/MaterialTabsModule/src/main/res/drawable-xxhdpi/left_arrow.png b/MaterialTabTest/MaterialTabsModule/src/main/res/drawable-xxhdpi/left_arrow.png
similarity index 100%
rename from MaterialTabsModule/src/main/res/drawable-xxhdpi/left_arrow.png
rename to MaterialTabTest/MaterialTabsModule/src/main/res/drawable-xxhdpi/left_arrow.png
diff --git a/MaterialTabsModule/src/main/res/drawable-xxhdpi/right_arrow.png b/MaterialTabTest/MaterialTabsModule/src/main/res/drawable-xxhdpi/right_arrow.png
similarity index 100%
rename from MaterialTabsModule/src/main/res/drawable-xxhdpi/right_arrow.png
rename to MaterialTabTest/MaterialTabsModule/src/main/res/drawable-xxhdpi/right_arrow.png
diff --git a/MaterialTabsModule/src/main/res/drawable-xxxhdpi/left_arrow.png b/MaterialTabTest/MaterialTabsModule/src/main/res/drawable-xxxhdpi/left_arrow.png
similarity index 100%
rename from MaterialTabsModule/src/main/res/drawable-xxxhdpi/left_arrow.png
rename to MaterialTabTest/MaterialTabsModule/src/main/res/drawable-xxxhdpi/left_arrow.png
diff --git a/MaterialTabsModule/src/main/res/drawable-xxxhdpi/right_arrow.png b/MaterialTabTest/MaterialTabsModule/src/main/res/drawable-xxxhdpi/right_arrow.png
similarity index 100%
rename from MaterialTabsModule/src/main/res/drawable-xxxhdpi/right_arrow.png
rename to MaterialTabTest/MaterialTabsModule/src/main/res/drawable-xxxhdpi/right_arrow.png
diff --git a/MaterialTabsModule/src/main/res/layout/material_tab.xml b/MaterialTabTest/MaterialTabsModule/src/main/res/layout/material_tab.xml
similarity index 100%
rename from MaterialTabsModule/src/main/res/layout/material_tab.xml
rename to MaterialTabTest/MaterialTabsModule/src/main/res/layout/material_tab.xml
diff --git a/MaterialTabsModule/src/main/res/layout/material_tab_icon.xml b/MaterialTabTest/MaterialTabsModule/src/main/res/layout/material_tab_icon.xml
similarity index 100%
rename from MaterialTabsModule/src/main/res/layout/material_tab_icon.xml
rename to MaterialTabTest/MaterialTabsModule/src/main/res/layout/material_tab_icon.xml
diff --git a/MaterialTabsModule/src/main/res/layout/tab.xml b/MaterialTabTest/MaterialTabsModule/src/main/res/layout/tab.xml
similarity index 100%
rename from MaterialTabsModule/src/main/res/layout/tab.xml
rename to MaterialTabTest/MaterialTabsModule/src/main/res/layout/tab.xml
diff --git a/MaterialTabsModule/src/main/res/layout/tab_icon.xml b/MaterialTabTest/MaterialTabsModule/src/main/res/layout/tab_icon.xml
similarity index 100%
rename from MaterialTabsModule/src/main/res/layout/tab_icon.xml
rename to MaterialTabTest/MaterialTabsModule/src/main/res/layout/tab_icon.xml
diff --git a/MaterialTabsModule/src/main/res/values-sw600dp/bools.xml b/MaterialTabTest/MaterialTabsModule/src/main/res/values-sw600dp/bools.xml
similarity index 100%
rename from MaterialTabsModule/src/main/res/values-sw600dp/bools.xml
rename to MaterialTabTest/MaterialTabsModule/src/main/res/values-sw600dp/bools.xml
diff --git a/MaterialTabsModule/src/main/res/values-sw600dp/ids.xml b/MaterialTabTest/MaterialTabsModule/src/main/res/values-sw600dp/ids.xml
similarity index 100%
rename from MaterialTabsModule/src/main/res/values-sw600dp/ids.xml
rename to MaterialTabTest/MaterialTabsModule/src/main/res/values-sw600dp/ids.xml
diff --git a/MaterialTabsModule/src/main/res/values/attrs.xml b/MaterialTabTest/MaterialTabsModule/src/main/res/values/attrs.xml
similarity index 100%
rename from MaterialTabsModule/src/main/res/values/attrs.xml
rename to MaterialTabTest/MaterialTabsModule/src/main/res/values/attrs.xml
diff --git a/MaterialTabsModule/src/main/res/values/bools.xml b/MaterialTabTest/MaterialTabsModule/src/main/res/values/bools.xml
similarity index 100%
rename from MaterialTabsModule/src/main/res/values/bools.xml
rename to MaterialTabTest/MaterialTabsModule/src/main/res/values/bools.xml
diff --git a/MaterialTabsModule/src/main/res/values/dimens.xml b/MaterialTabTest/MaterialTabsModule/src/main/res/values/dimens.xml
similarity index 100%
rename from MaterialTabsModule/src/main/res/values/dimens.xml
rename to MaterialTabTest/MaterialTabsModule/src/main/res/values/dimens.xml
diff --git a/MaterialTabTest/app/app.iml b/MaterialTabTest/app/app.iml
index 12e2357..3fb03e5 100644
--- a/MaterialTabTest/app/app.iml
+++ b/MaterialTabTest/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="MaterialTabTest" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="MaterialTabTest" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -9,11 +9,15 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
+        <afterSyncTasks>
+          <task>generateDebugSources</task>
+          <task>generateDebugTestSources</task>
+        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -22,8 +26,9 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -60,33 +65,26 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-21.0.0" level="project" />
-    <orderEntry type="module" module-name="MaterialTabsModule" exported="" />
+    <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="android-ui-1.2" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="MaterialTabs-0.11" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/MaterialTabTest/app/build.gradle b/MaterialTabTest/app/build.gradle
index ed7ab92..b36666b 100644
--- a/MaterialTabTest/app/build.gradle
+++ b/MaterialTabTest/app/build.gradle
@@ -21,6 +21,5 @@ android {
 
 dependencies {
     compile 'com.android.support:appcompat-v7:21.0.0'
-    compile project(':MaterialTabsModule')
-    //compile 'it.neokree:MaterialTabs:T'
+    compile 'it.neokree:MaterialTabs:0.11'
 }
diff --git a/MaterialTabTest/app/src/main/java/it/neokree/materialtabtest/FragmentTextTwo.java b/MaterialTabTest/app/src/main/java/it/neokree/materialtabtest/FragmentTextTwo.java
new file mode 100644
index 0000000..0068f2e
--- /dev/null
+++ b/MaterialTabTest/app/src/main/java/it/neokree/materialtabtest/FragmentTextTwo.java
@@ -0,0 +1,15 @@
+package it.neokree.materialtabtest;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class FragmentTextTwo extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.activity_fragment_text_two, container, false);
+    }
+}
diff --git a/MaterialTabTest/app/src/main/java/it/neokree/materialtabtest/TextTabActivity.java b/MaterialTabTest/app/src/main/java/it/neokree/materialtabtest/TextTabActivity.java
index 168135a..4e0cf68 100644
--- a/MaterialTabTest/app/src/main/java/it/neokree/materialtabtest/TextTabActivity.java
+++ b/MaterialTabTest/app/src/main/java/it/neokree/materialtabtest/TextTabActivity.java
@@ -78,18 +78,34 @@ public ViewPagerAdapter(FragmentManager fm) {
         }
 
         public Fragment getItem(int num) {
-            return new FragmentText();
+            //return new FragmentText();
+            switch (num) {
+                case 0:
+                    FragmentText ft = new FragmentText();
+                    return ft;
+                case 1:
+                    FragmentTextTwo ftw = new FragmentTextTwo();
+                    return ftw;
+                default:
+                    return null;
+            }
         }
 
         @Override
         public int getCount() {
-            return 3;
+            return 2;
         }
 
         @Override
         public CharSequence getPageTitle(int position) {
-            return "Sezione " + position;
+            switch (position) {
+                case 0:
+                    return "tab 1";
+                case 1:
+                    return "tab 2";
+                default: return null;
+            }
         }
 
     }
-}
+}
\ No newline at end of file
diff --git a/MaterialTabTest/app/src/main/res/layout/activity_fragment_text_two.xml b/MaterialTabTest/app/src/main/res/layout/activity_fragment_text_two.xml
new file mode 100644
index 0000000..2c5e215
--- /dev/null
+++ b/MaterialTabTest/app/src/main/res/layout/activity_fragment_text_two.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="it.neokree.materialtabtest.FragmentTextTwo">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/imageView"
+        android:layout_centerVertical="true"
+        android:layout_centerHorizontal="true"
+        android:src="@drawable/ic_launcher" />
+</RelativeLayout>
diff --git a/MaterialTabTest/settings.gradle b/MaterialTabTest/settings.gradle
index 1c29bba..e7b4def 100644
--- a/MaterialTabTest/settings.gradle
+++ b/MaterialTabTest/settings.gradle
@@ -1 +1 @@
-include ':app', ':MaterialTabsModule'
+include ':app'