diff --git a/.travis.yml b/.travis.yml
index dd9ad8e0..54dff226 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,24 @@
 language: java
+
+sudo: false # faster builds
+
 jdk:
   - oraclejdk8
-cache:
-  directories:
-  - $HOME/.m2
+
+install:
+    true
+
+before_script:
+  - pip install --user codecov
+  - curl http://www.jpm4j.org/install/script | sh
+
+script:
+  - mvn -U -B -V test --fail-at-end -Dsource.skip=true -Dmaven.javadoc.skip=true
+
+after_success:
+  - mvn clean test jacoco:report
+  - codecov --build "$TRAVIS_JOB_NUMBER-jdk8"
+
+notifications:
+    email:
+      on_failure: change
\ No newline at end of file
diff --git a/README.md b/README.md
index fbfac964..9587d293 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,26 @@
 embedded-redis
 ==============
 
-[![Build Status](https://ci.appveyor.com/api/projects/status/github/kstyrc/embedded-redis?branch=master&svg=true)](https://ci.appveyor.com/project/kstyrc/embedded-redis) Windows
+Redis embedded server for Java integration testing
+
+Fork Notes
+==============
+This repository clones from [kstyrc](https://github.com/kstyrc/embedded-redis) original repository.
+The aim is to release some long waiting fixes.
 
-[![Build Status](https://travis-ci.org/kstyrc/embedded-redis.png?branch=master)](https://travis-ci.org/kstyrc/embedded-redis) Linux
 
-Redis embedded server for Java integration testing
+**Source Website:** *[github.com/ozimov/embedded-redis](http://github.com/ozimov/embedded-redis/)*<br />
+
+**Latest Release:** *0.7.0* <br />
+**Latest Artifact:** *it.ozimov:embedded-redis* <br />
+**Continuous Integration:** <br />
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/it.ozimov/embedded-redis/badge.svg)](https://maven-badges.herokuapp.com/maven-central/ com.github.ozimov/spring-boot-email-core)
+<br />
+[![Build Status](https://travis-ci.org/ozimov/embedded-redis.svg?branch=master)](https://travis-ci.org/ozimov/embedded-redis)
+[![codecov.io](https://codecov.io/github/ozimov/embedded-redis/coverage.svg?branch=master)](https://codecov.io/github/ozimov/embedded-redis?branch=master)
+[![Codacy Badge](https://api.codacy.com/project/badge/grade/7a4364b93df6473fb18a597e900edceb)](https://www.codacy.com/app/roberto-trunfio/embedded-redis)
+
+![codecov.io](https://codecov.io/github/ozimov/embedded-redis/branch.svg?branch=master)
 
 Maven dependency
 ==============
@@ -13,25 +28,9 @@ Maven dependency
 Maven Central:
 ```xml
 <dependency>
-  <groupId>com.github.kstyrc</groupId>
-  <artifactId>embedded-redis</artifactId>
-  <version>0.6</version>
-</dependency>
-```
-
-Previous releases (before 0.6):
-```xml
-<repository>
-  <id>clojars.org</id>
-  <url>http://clojars.org/repo</url>
-</repository>
-
-...
-
-<dependency>
-  <groupId>redis.embedded</groupId>
+  <groupId>it.ozimov</groupId>
   <artifactId>embedded-redis</artifactId>
-  <version>0.5</version>
+  <version>0.7.0</version>
 </dependency>
 ```
 
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 5ade0ed8..00000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-version: '{build}'
-os: Windows Server 2012
-environment:
-  JAVA_HOME: C:\Program Files\Java\jdk1.8.0
-install:
-  - ps: |
-      Add-Type -AssemblyName System.IO.Compression.FileSystem
-      if (!(Test-Path -Path "C:\maven" )) {
-        (new-object System.Net.WebClient).DownloadFile(
-          'http://www.us.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.zip',
-          'C:\maven-bin.zip'
-        )
-        [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
-      }
-  - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH%
-  - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g
-  - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
-  - cmd: mvn --version
-  - cmd: java -version
-build_script:
-  - mvn clean package -B -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
-test_script:
-  - mvn clean install --batch-mode -Pqulice
-cache:
-  - C:\maven\
-  - C:\Users\appveyor\.m2
-  
diff --git a/pom.xml b/pom.xml
index 4d738924..6787f49a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.github.kstyrc</groupId>
+    <groupId>it.ozimov</groupId>
     <artifactId>embedded-redis</artifactId>
     <packaging>jar</packaging>
-    <version>0.7-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <name>embedded-redis</name>
-    <description>Redis embedded server for Java integration testing</description>
-    <url>https://github.com/kstyrc/embedded-redis</url>
+    <description>Redis embedded server for Java integration testing.
+        Project forked from https://github.com/kstyrc/embedded-redis</description>
+    <url>https://github.com/ozimov/embedded-redis</url>
 
     <licenses>
         <license>
@@ -18,10 +19,10 @@
     </licenses>
 
     <scm>
-        <url>https://github.com/kstyrc/embedded-redis</url>
-        <connection>scm:git:https://github.com/kstyrc/embedded-redis.git</connection>
-        <developerConnection>scm:git:https://github.com/kstyrc/embedded-redis.git</developerConnection>
-        <tag>embedded-redis-0.5</tag>
+        <url>https://github.com/ozimov/embedded-redis</url>
+        <connection>scm:git:https://github.com/ozimov/embedded-redis.git</connection>
+        <developerConnection>scm:git:https://github.com/ozimov/embedded-redis.git</developerConnection>
+        <tag>embedded-redis-0.7.0</tag>
     </scm>
 
     <developers>
@@ -35,118 +36,175 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-    </distributionManagement>
-
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>18.0</version>
+            <version>21.0</version>
         </dependency>
 
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.4</version>
+            <version>2.5</version>
         </dependency>
         
         <!-- TEST DEPENDENCIES -->
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1.1</version>
+            <version>1.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>2.6.0</version>
+            <version>2.9.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.8.5</version>
+            <version>1.10.19</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.12</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-redis</artifactId>
-            <version>1.4.1.RELEASE</version>
+            <version>1.8.0.RELEASE</version>
             <scope>test</scope>
         </dependency>
 
     </dependencies>
 
+    <prerequisites>
+        <maven>3.0.4</maven>
+    </prerequisites>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <repository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
     <build>
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>${project.build.directory}/generated-resources</directory>
+            </resource>
+        </resources>
         <plugins>
-
+            <!-- MAVEN SUREFIRE +  FAILSAFE -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.19.1</version>
+            </plugin>
             <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.7.9</version>
+                <executions>
+                    <execution>
+                        <id>default-prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <!-- Partially works for Lombok -->
                 <configuration>
-                    <compilerVersion>1.6</compilerVersion>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <excludes>
+                        <exclude>**/config/**</exclude>
+                        <exclude>**/model/**</exclude>
+                        <exclude>**/item/**</exclude>
+                    </excludes>
                 </configuration>
             </plugin>
 
+            <!--Deploy plugins -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <generateBackupPoms>false</generateBackupPoms>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>2.5.1</version>
+                <artifactId>maven-scm-plugin</artifactId>
+                <version>1.9.5</version>
                 <configuration>
-                    <autoVersionSubmodules>true</autoVersionSubmodules>
-                    <useReleaseProfile>false</useReleaseProfile>
-                    <releaseProfiles>release</releaseProfiles>
-                    <goals>deploy</goals>
+                    <pushChanges>false</pushChanges>
+                    <tag>${project.version}</tag>
                 </configuration>
             </plugin>
-
         </plugins>
     </build>
-    
+
     <profiles>
+        <profile>
+            <id>disable-java8-doclint</id>
+            <activation>
+                <jdk>[1.8,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.10.4</version>
+                        <configuration>
+                            <additionalparam>-Xdoclint:none</additionalparam>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>release</id>
             <build>
                 <plugins>
-                    
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>2.1.2</version>
+                        <version>3.0.1</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
                                 <goals>
-                                    <goal>jar</goal>
+                                    <goal>jar-no-fork</goal>
                                 </goals>
                             </execution>
                         </executions>
                     </plugin>
-
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.8.1</version>
+                        <version>2.10.3</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -156,11 +214,10 @@
                             </execution>
                         </executions>
                     </plugin>
-
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.5</version>
+                        <version>1.6</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -171,11 +228,55 @@
                             </execution>
                         </executions>
                     </plugin>
-                    
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <version>1.6.7</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <serverId>ossrh</serverId>
+                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                        </configuration>
+                    </plugin>
                 </plugins>
             </build>
         </profile>
-        
     </profiles>
 
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>2.3</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>dependency-updates-report</report>
+                            <report>plugin-updates-report</report>
+                            <report>property-updates-report</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
+    <!--DISCLAIMER: use as-->
+    <!--mvn versions:display-dependency-updates-->
+
+    <repositories>
+        <repository>
+            <id>spring-releases</id>
+            <url>https://repo.spring.io/libs-release</url>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-releases</id>
+            <url>https://repo.spring.io/libs-release</url>
+        </pluginRepository>
+    </pluginRepositories>
+
 </project>
diff --git a/release.sh b/release.sh
new file mode 100755
index 00000000..fe405e07
--- /dev/null
+++ b/release.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+# Deploy maven artifact in current directory into Maven central repository
+# using maven-release-plugin goals
+
+
+
+###########################################################
+###########################################################
+cat << "RELEASE"
+██████╗ ███████╗██╗     ███████╗ █████╗ ███████╗███████╗
+██╔══██╗██╔════╝██║     ██╔════╝██╔══██╗██╔════╝██╔════╝
+██████╔╝█████╗  ██║     █████╗  ███████║███████╗█████╗
+██╔══██╗██╔══╝  ██║     ██╔══╝  ██╔══██║╚════██║██╔══╝
+██║  ██║███████╗███████╗███████╗██║  ██║███████║███████╗
+╚═╝  ╚═╝╚══════╝╚══════╝╚══════╝╚═╝  ╚═╝╚══════╝╚══════╝
+RELEASE
+
+set -e
+
+mvn --settings ~/.m2/settings.xml scm:check-local-modification
+
+# release
+echo "\n----------------------------------------"
+echo "When at prompt, type the release version (e.g. from 1.0-SNAPSHOT to 1.0)\n"
+mvn --settings ~/.m2/settings.xml versions:set
+git commit -am "[Deploy phase] Preparing release"
+mvn --settings ~/.m2/settings.xml clean deploy -P release
+mvn --settings ~/.m2/settings.xml scm:tag
+echo 'Release deployed'
+
+
+###########################################################
+###########################################################
+# next development version
+cat << "NEXT_ITERATION"
+███╗   ██╗███████╗██╗  ██╗████████╗
+████╗  ██║██╔════╝╚██╗██╔╝╚══██╔══╝
+██╔██╗ ██║█████╗   ╚███╔╝    ██║
+██║╚██╗██║██╔══╝   ██╔██╗    ██║
+██║ ╚████║███████╗██╔╝ ██╗   ██║
+╚═╝  ╚═══╝╚══════╝╚═╝  ╚═╝   ╚═╝
+
+    ██╗████████╗███████╗██████╗  █████╗ ████████╗██╗ ██████╗ ███╗   ██╗
+    ██║╚══██╔══╝██╔════╝██╔══██╗██╔══██╗╚══██╔══╝██║██╔═══██╗████╗  ██║
+    ██║   ██║   █████╗  ██████╔╝███████║   ██║   ██║██║   ██║██╔██╗ ██║
+    ██║   ██║   ██╔══╝  ██╔══██╗██╔══██║   ██║   ██║██║   ██║██║╚██╗██║
+    ██║   ██║   ███████╗██║  ██║██║  ██║   ██║   ██║╚██████╔╝██║ ╚████║
+    ╚═╝   ╚═╝   ╚══════╝╚═╝  ╚═╝╚═╝  ╚═╝   ╚═╝   ╚═╝ ╚═════╝ ╚═╝  ╚═══╝
+NEXT_ITERATION
+
+echo "When at prompt, type the SNAPSHOT version (e.g. from 1.0 to 2.0-SNAPSHOT)\n"
+mvn --settings ~/.m2/settings.xml versions:set
+git commit -am "[Deploy phase] Preparing for next iteration"
+
+# updating origin
+git push --force --follow-tags
+
+echo 'Next iteration prepared'