diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 43f111df22a33eaffd6b3f5f3869393eeebaaf5a..1690787fd438d8a832ad2976941ca68555cebd91 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,10 @@ build:
   stage: build
   script:
     - sed -i " 1 s/.*/&-b${CI_JOB_ID}/" version
-    - ./gradlew -g /cache/.gradle clean build jacocoTestReport dist
+    - cat version
+    - ./gradlew -g /cache/.gradle clean build jacocoTestReport
+    - ./gradlew -g /cache/.gradle clean sonarqube -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_TOKEN
+    - ./gradlew -g /cache/.gradle clean dist
   artifacts:
     paths:
     - build/jadx*.zip
diff --git a/README.md b/README.md
index ace36396f4152a84678517dc2fac03fc34c005ae..1c803b1586546eacde562ba3e92969e5b5c3a0c6 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,11 @@
 ## JADX
 
 [![Build Status](https://travis-ci.org/skylot/jadx.png?branch=master)](https://travis-ci.org/skylot/jadx)
-[![Build Status](https://gitlab.com/skylot/jadx/badges/master/build.svg)](https://gitlab.com/skylot/jadx/commits/master)
-[![coverage report](https://gitlab.com/skylot/jadx/badges/master/coverage.svg)](https://gitlab.com/skylot/jadx/commits/master)
+[![Gitlab CI](https://gitlab.com/skylot/jadx/badges/master/build.svg)](https://gitlab.com/skylot/jadx/builds)
+[![Jadx Core Coverage](https://gitlab.com/skylot/jadx/badges/master/coverage.svg)](https://gitlab.com/skylot/jadx/builds)
 [![Code Coverage](https://codecov.io/gh/skylot/jadx/branch/master/graph/badge.svg)](https://codecov.io/gh/skylot/jadx)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/2166/badge.svg)](https://scan.coverity.com/projects/2166)
+[![SonarQube Bugs](https://sonarcloud.io/api/badges/measure?key=jadx&metric=bugs)](https://sonarcloud.io/dashboard?id=jadx)
 [![Latest release](https://img.shields.io/github/release/skylot/jadx.svg)](https://github.com/skylot/jadx/releases/latest)
 [![Latest release downloads](https://img.shields.io/github/downloads/skylot/jadx/latest/total.svg)](https://github.com/skylot/jadx/releases/latest)
 [![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
@@ -23,6 +24,8 @@ Command line and GUI tools for produce Java source code from Android Dex and Apk
 
 
 ### Building from source
+Java 8 JDK or higher must be installed:
+
     git clone https://github.com/skylot/jadx.git
     cd jadx
     ./gradlew dist
@@ -38,7 +41,7 @@ Run **jadx** on itself:
 
     cd build/jadx/
     bin/jadx -d out lib/jadx-core-*.jar
-    #or
+    # or
     bin/jadx-gui lib/jadx-core-*.jar
 
 
@@ -86,11 +89,6 @@ To support this project you can:
     * Java code examples which decompiles incorrectly
     * Error log and link to _public available_ apk file or app page on Google play
 
-And any other comments will be very helpfull,
-because at current stage of development it is very time consuming
-to **find** new bugs, design and implement new features.
-Also I need to **prioritize** these task for complete most important at first.
-
 ---------------------------------------
 *Licensed under the Apache 2.0 License*
 
diff --git a/build.gradle b/build.gradle
index 1599fd2b954c5d72ffc6ed7499171bb3005a54a0..10f30aa843560b6e288701971a1d14ac463ea6b0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'com.github.ksoichiro.console.reporter' version '0.5.0'
+    id 'org.sonarqube' version '2.4'
 }
 
 ext.jadxVersion = file('version').readLines().get(0)
@@ -54,6 +55,13 @@ allprojects {
     }
 }
 
+sonarqube {
+    properties {
+        property 'sonar.exclusions', '**/jadx/samples/**/*,**/test-app/**/*'
+        property 'sonar.coverage.exclusions', '**/jadx/gui/**/*'
+    }
+}
+
 task copyArtifacts(type: Sync, dependsOn: ['jadx-cli:installDist', 'jadx-gui:installDist']) {
     destinationDir file("$buildDir/jadx")
     ['jadx-cli', 'jadx-gui'].each {
diff --git a/version b/version
index ee6cdce3c29053ac99607147be5be250efa001bd..faef31a4357c48d6e4c55e84c8be8e3bc9055e20 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.6.1
+0.7.0