diff --git a/.travis.yml b/.travis.yml
index 856b7b4b..50e960dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,14 +14,35 @@ branches:
     - travis-dev-build
 
 before_script:
-  - sed -i -re 's/(versionName ".*)"/\1-dev_'${TRAVIS_COMMIT:0:8}'"/' android_app/app/build.gradle
+  - sed -i -r
+    -e 's/applicationId "[^"]+/\0.dev/'
+    -e 's/(versionCode ).*/\1'$(date +%s)'/'
+    -e 's/versionName "[^"]+/\0-dev_'${TRAVIS_COMMIT:0:8}'/'
+    android_app/app/build.gradle
+  - sed -i -r
+    -e 's/(<string name="app_name">[^<]+)/\1 (dev)/'
+    android_app/app/src/main/res/values*/strings.xml
+  # Create keystore by running:
+  #   keytool -genkey -v -keystore debug.keystore -storepass android \
+  #     -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 \
+  #     -validity 10000 -dname "CN=Android Debug,O=Android,C=US"
+  #
+  # Then base64 encode it with:
+  #   base64 -w0 debug.keystore
+  #
+  # Then add this to Travis environment variables as DEBUG_KEYSTORE (make sure
+  # not to enable displaying value in build logs)"
+  - test -n "$DEBUG_KEYSTORE"
+    && echo "$DEBUG_KEYSTORE" | base64 -d > $HOME/.android/debug.keystore
+    || true
 
 script: cd android_app && ./gradlew testDebug assembleDebug
 
 before_deploy:
   - ln -s app/build/outputs/apk/debug/app-debug.apk openScale-dev-build.apk
   - git tag -f travis-dev-build
-  - git remote add gh https://${TRAVIS_REPO_SLUG%/*}:${GITHUB_API_KEY}@github.com/${TRAVIS_REPO_SLUG}.git
+  - git remote add gh
+    https://${TRAVIS_REPO_SLUG%/*}:${GITHUB_API_KEY}@github.com/${TRAVIS_REPO_SLUG}.git
   - git push -f gh travis-dev-build
   - git remote remove gh
 
@@ -31,7 +52,8 @@ deploy:
   file: openScale-dev-build.apk
   skip_cleanup: true
   name: openScale development build
-  body: Automatic openScale development build of $TRAVIS_BRANCH ($TRAVIS_COMMIT) built by Travis CI on $(date +'%F %T %Z').
+  body: Automatic openScale development build of $TRAVIS_BRANCH
+    ($TRAVIS_COMMIT) built by Travis CI on $(date +'%F %T %Z').
   prerelease: true
   overwrite: true
   target_commitish: $TRAVIS_COMMIT
diff --git a/README.md b/README.md
index a812797d..133a8e2a 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ openScale is an open source app which support various Bluetooth scales to keep e
 <a href="https://play.google.com/store/apps/details?id=com.health.openscale" target="_blank">
 <img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="80"/></a>
 
-Install [openScale-dev-build.apk](https://github.com/oliexdev/openScale/releases/tag/travis-dev-build) to get the latest development build generated by [Travis CI](https://travis-ci.org/). But be aware that this version may contain bugs and you don't get any automatically updates.
+Install [openScale-dev-build.apk](https://github.com/oliexdev/openScale/releases/tag/travis-dev-build) to get the latest development build generated by [Travis CI](https://travis-ci.org/). This version can co-exist with the official release, but to share measurements you need to export them (Settings -> Backup) from one version and import them in the other. Also be aware that this version may contain bugs and you don't get any automatic updates.
 
 # Features