diff --git a/.travis.yml b/.travis.yml
index 9f4020f..5c3d68c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,15 @@
 language: java
 jdk: oraclejdk7
+
 before_install:
-  # Install base Android SDK
-  - sudo apt-get update -qq
-  - sudo apt-get install expect
-  - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq libstdc++6:i386 lib32z1; fi
-  - wget -O android-sdk.tgz http://dl.google.com/android/android-sdk_r22.0.4-linux.tgz
-  - tar xzf android-sdk.tgz
-  - export ANDROID_HOME=$PWD/android-sdk-linux
-  - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
   - chmod +x $PWD/.travis_install_android.sh
   - $PWD/.travis_install_android.sh
 
-  - git clone git://github.com/mosabua/maven-android-sdk-deployer.git
-  - cd ./maven-android-sdk-deployer/
-  - mvn install -P4.2
-  - cd ..
+  - chmod +x $PWD/.travis_install_android_dependencies.sh
+  - $PWD/.travis_install_android_dependencies.sh
 
-  # Create and start emulator
-  - echo no | android create avd --force -n Default -t android-17 --abi armeabi-v7a
-  - emulator -avd Default -no-skin -no-audio -no-window &
+  - chmod +x $PWD/.travis_start_emulator.sh
+  - $PWD/.travis_start_emulator.sh
 
 before_script:
   - chmod +x $PWD/.travis_wait_for_emulator.sh
diff --git a/.travis_install_android.sh b/.travis_install_android.sh
index 89c88b2..07e0fa6 100644
--- a/.travis_install_android.sh
+++ b/.travis_install_android.sh
@@ -1,22 +1,14 @@
-#!/usr/bin/expect -f
-spawn android update sdk --filter tools,platform-tools,build-tools-19.0.0,extra-android-support,android-17,sysimg-17,addon-google_apis-google-17,android-19,sysimg-19,addon-google_apis-google-19,addon-google_apis-google-19,extra-google-play_billing,extra-google-m2repository,extra-google-analytics_sdk_v2,extra-google-gcm,extra-google-google_play_services,extra-google-play_apk_expansion,extra-android-m2repository --no-ui --force --all
-expect "Do you accept the license *:"
-send -- "y\r"
-expect "Do you accept the license *:"
-send -- "y\r"
-expect "Do you accept the license *:"
-send -- "y\r"
-expect "Do you accept the license *:"
-send -- "y\r"
-expect "Do you accept the license *:"
-send -- "y\r"
-expect "Do you accept the license *:"
-send -- "y\r"
-expect "Do you accept the license *:"
-send -- "y\r"
-interact
+#!/bin/bash
 
-spawn android update sdk --filter extra-google-admob_ads_sdk,extra-google-play_licensing --no-ui --force --all
-expect "Do you accept the license *:"
-send -- "y\r"
-interact
+# Script installs Android SDK
+
+sudo apt-get update -qq
+if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq libstdc++6:i386 lib32z1; fi
+wget -O android-sdk.tgz http://dl.google.com/android/android-sdk_r22.0.4-linux.tgz
+tar xzf android-sdk.tgz
+export ANDROID_HOME=$PWD/android-sdk-linux
+export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+
+sudo apt-get install expect
+chmod +x $PWD/.travis_install_android_sdk.sh
+$PWD/.travis_install_android_sdk.sh
diff --git a/.travis_install_android_dependencies.sh b/.travis_install_android_dependencies.sh
new file mode 100755
index 0000000..dcfd972
--- /dev/null
+++ b/.travis_install_android_dependencies.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Scripts installs Android SDK artifacts in local Maven repository
+
+git clone git://github.com/serso/maven-android-sdk-deployer.git
+cd ./maven-android-sdk-deployer/
+git checkout tags/api-19
+mvn install -P4.2
+cd ..
\ No newline at end of file
diff --git a/.travis_install_android_sdk.sh b/.travis_install_android_sdk.sh
new file mode 100644
index 0000000..7b292d3
--- /dev/null
+++ b/.travis_install_android_sdk.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/expect -f
+
+# Script installs Android SDK components
+
+spawn android update sdk --filter tools,platform-tools,build-tools-19.0.0,extra-android-support,android-17,sysimg-17,addon-google_apis-google-17,android-19,sysimg-19,addon-google_apis-google-19,addon-google_apis-google-19,extra-google-play_billing,extra-google-m2repository,extra-google-analytics_sdk_v2,extra-google-gcm,extra-google-google_play_services,extra-google-play_apk_expansion,extra-android-m2repository --no-ui --force --all
+expect "Do you accept the license *:"
+send -- "y\r"
+expect "Do you accept the license *:"
+send -- "y\r"
+expect "Do you accept the license *:"
+send -- "y\r"
+expect "Do you accept the license *:"
+send -- "y\r"
+expect "Do you accept the license *:"
+send -- "y\r"
+expect "Do you accept the license *:"
+send -- "y\r"
+expect "Do you accept the license *:"
+send -- "y\r"
+interact
+
+# WORKAROUND: for some reason we need to download following extras separately (otherwise we will get PkgVersion=2 instead of PkgVersion=2.0.0)
+spawn android update sdk --filter extra-google-admob_ads_sdk,extra-google-play_licensing --no-ui --force --all
+expect "Do you accept the license *:"
+send -- "y\r"
+interact
diff --git a/.travis_start_emulator.sh b/.travis_start_emulator.sh
new file mode 100644
index 0000000..2659e47
--- /dev/null
+++ b/.travis_start_emulator.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Scripts starts Android emulator with name 'Default'
+
+echo no | android create avd --force -n Default -t android-17 --abi armeabi-v7a
+emulator -avd Default -no-skin -no-audio -no-window &
\ No newline at end of file
diff --git a/.travis_wait_for_emulator.sh b/.travis_wait_for_emulator.sh
index 207f028..bf3b95f 100644
--- a/.travis_wait_for_emulator.sh
+++ b/.travis_wait_for_emulator.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Script waits for Android emulator to be started
+
 bootanim=""
 failcounter=0
 until [[ "$bootanim" =~ "stopped" ]]; do