diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 00000000..9a23d6b3
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,22 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/code
+    docker:
+      - image: circleci/android:api-25-alpha
+    environment:
+      JVM_OPTS: -Xmx3200m
+    steps:
+      - checkout
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}
+      - run:
+          name: Run Build
+          command: export TERM=${TERM:-dumb} && ./gradlew clean build --recompile-scripts --refresh-dependencies --parallel --stacktrace
+      - store_artifacts:
+          path: app/build/outputs/apk/
+          destination: artifact-file
diff --git a/README.md b/README.md
index 1a2f5099..76270564 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-The Pushjet Android Client [![Circle CI](https://circleci.com/gh/Pushjet/Pushjet-Android.svg?style=svg)](https://circleci.com/gh/Pushjet/Pushjet-Android) [![License](http://img.shields.io/badge/license-BSD-blue.svg?style=flat)](/LICENSE)
+The Pushjet Android Client [![CircleCI](https://circleci.com/gh/anilrobo90/Pushjet-Android.svg?style=svg)](https://circleci.com/gh/anilrobo90/Pushjet-Android) [![License](http://img.shields.io/badge/license-BSD-blue.svg?style=flat)](/LICENSE)
 ==========================
 This is the pushjet android client. It currently uses google GCM to send and receive messages. This means 
 that any message that is directed at the android client *will* go through google. The client is licensed 
diff --git a/app/build.gradle b/app/build.gradle
index c81209e3..7274ecde 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,16 +1,20 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.0"
 
     defaultConfig {
         applicationId "io.Pushjet.api"
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 25
         versionCode 6
         versionName "1.4"
     }
+    dexOptions {
+        javaMaxHeapSize "4g"
+        preDexLibraries = false
+    }
     buildTypes {
         release {
             minifyEnabled false