diff --git a/.travis.yml b/.travis.yml
index 1537759..e0a0a1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ sudo: required
 scala:
 - 2.11.8
 - 2.12.8
+- 2.13.0
 jdk:
 - oraclejdk8
 script: "./scripts/test.sh"
@@ -28,6 +29,10 @@ jobs:
     script: "./scripts/publish.sh $TRAVIS_SCALA_VERSION"
     name: Deploying scala 2.12.8 artifacts
     scala: 2.12.8
+  - stage: deploy_2.13
+    script: "./scripts/publish.sh $TRAVIS_SCALA_VERSION"
+    name: Deploying scala 2.13.0 artifacts
+    scala: 2.12.8
   - stage: release
     script: chmod 777 scripts/release.sh && ./scripts/release.sh
     scala: 2.12.8
@@ -37,5 +42,7 @@ stages:
   if: branch = master AND type != pull_request
 - name: deploy_2.12
   if: branch = master AND type != pull_request
+- name: deploy_2.13
+  if: branch = master AND type != pull_request
 - name: release
   if: branch = master AND type != pull_request
diff --git a/README.md b/README.md
index 2feee5c..7423530 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Scala Embedded InfluxDB
+# scala-embedinflux
 [![Build Status](https://travis-ci.org/fsanaulla/scala-embedinflux.svg?branch=master)](https://travis-ci.org/fsanaulla/scala-embedinflux)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/e9932125a5d2487f901e3170a70f4904)](https://www.codacy.com/app/fsanaulla/scala-embedinflux?utm_source=github.com&utm_medium=referral&utm_content=fsanaulla/scala-embedinflux&utm_campaign=Badge_Grade)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.fsanaulla/core-testing_2.11/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.fsanaulla/core-testing_2.11)
diff --git a/changelog/0.2.1.md b/changelog/0.2.1.md
new file mode 100644
index 0000000..ab53db1
--- /dev/null
+++ b/changelog/0.2.1.md
@@ -0,0 +1,5 @@
+Including issues:
+- fsanaulla/scala-embedinflux#8 support for 2.13 scala
+
+Contributors:
+- @fsanaulla
diff --git a/modules/specs2/src/main/scala/com/github/fsanaulla/specs2/embedinflux/EmbeddedInfluxDB.scala b/modules/specs2/src/main/scala/com/github/fsanaulla/specs2/embedinflux/EmbeddedInfluxDB.scala
index 348119f..a961e8f 100644
--- a/modules/specs2/src/main/scala/com/github/fsanaulla/specs2/embedinflux/EmbeddedInfluxDB.scala
+++ b/modules/specs2/src/main/scala/com/github/fsanaulla/specs2/embedinflux/EmbeddedInfluxDB.scala
@@ -47,6 +47,6 @@ trait EmbeddedInfluxDB extends BeforeAfterAll { self: SpecificationLike with Inf
     influx.cleanup()
 
     // https://github.com/APISENSE/embed-influxDB/issues/19
-    Thread.sleep(10000)
+    Thread.sleep(1000)
   }
 }
diff --git a/project/Settings.scala b/project/Settings.scala
index bb70c7b..141e079 100644
--- a/project/Settings.scala
+++ b/project/Settings.scala
@@ -15,8 +15,8 @@ object Settings extends LibraryManagementSyntax {
   }
 
   lazy val common = List(
-    scalaVersion := "2.12.8",
-    crossScalaVersions := Seq("2.11.8", scalaVersion.value),
+    scalaVersion := "2.13.0",
+    crossScalaVersions := Seq("2.11.8", "2.12.8", scalaVersion.value),
     organization := Owner.organisation,
     homepage := Some(url("https://github.com/fsanaulla/scala-embedinflux")),
     licenses += "Apache-2.0" -> url("https://opensource.org/licenses/Apache-2.0"),
diff --git a/project/build.properties b/project/build.properties
index c3e3abc..7609b47 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.1.4
\ No newline at end of file
+sbt.version = 1.2.8
\ No newline at end of file
diff --git a/version.sbt b/version.sbt
index e033b22..cee41a9 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.2.0"
\ No newline at end of file
+version in ThisBuild := "0.2.1"
\ No newline at end of file