diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..4f81370
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,8 @@
+language: erlang
+otp_release:
+  - 19.2
+  - 18.3
+before_script:
+  - epmd -daemon
+script:
+  - make local_test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e844c41..a0111c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,17 @@
 # Change Log
 
-## [0.2.0](https://github.com/cabol/erlbus/tree/0.2.0) (2016-05-21)
+## [v0.2.1](https://github.com/cabol/erlbus/tree/v0.2.1) (2017-02-15)
+[Full Changelog](https://github.com/cabol/erlbus/compare/0.2.0...v0.2.1)
+
+**Closed issues:**
+
+- Fix tests to use rebar3 directly instead of call ct\_run [\#38](https://github.com/cabol/erlbus/issues/38)
+
+**Merged pull requests:**
+
+- \[\#38\] – Fix tests to use rebar3 directly instead of call ct\_run [\#39](https://github.com/cabol/erlbus/pull/39) ([cabol](https://github.com/cabol))
+
+## [0.2.0](https://github.com/cabol/erlbus/tree/0.2.0) (2016-05-22)
 [Full Changelog](https://github.com/cabol/erlbus/compare/0.1.0...0.2.0)
 
 **Fixed bugs:**
diff --git a/README.md b/README.md
index 744d548..d1491a3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 <img src="http://assets.nydailynews.com/polopoly_fs/1.1096240.1339765703!/img/httpImage/image.jpg_gen/derivatives/article_970/trains15n-1-web.jpg" height="200" width="100%" />
 
-# ErlBus
+# ErlBus [![Build Status](https://travis-ci.org/cabol/erlbus.svg?branch=master)](https://travis-ci.org/cabol/erlbus)
 
 Message / Event Bus written in Erlang.
 
diff --git a/src/ebus.app.src b/src/ebus.app.src
index 9c71b55..64850b3 100644
--- a/src/ebus.app.src
+++ b/src/ebus.app.src
@@ -4,10 +4,7 @@
   {id, "ebus"},
   {modules, []},
   {registered, []},
-  {applications, [
-    kernel,
-    stdlib
-  ]},
+  {applications, [kernel, stdlib]},
   {mod, {ebus, []}},
   {env, []},
   {maintainers, ["Carlos Andres Bolanos"]},
diff --git a/src/utils/ebus_task.erl b/src/utils/ebus_task.erl
index de51506..e84fbe4 100644
--- a/src/utils/ebus_task.erl
+++ b/src/utils/ebus_task.erl
@@ -295,6 +295,7 @@ get_initial_call({Mod, Fun, Args}) ->
   {Mod, Fun, length(Args)}.
 
 %% @private
+-spec exit(proc_info(), callback(), term(), term()) -> no_return().
 exit(_Info, _MFA, _LogReason, Reason)
     when Reason == normal orelse Reason == shutdown
     orelse (tuple_size(Reason) == 2 andalso element(1, Reason) == shutdown) ->
diff --git a/test/ebus_handler_SUITE.erl b/test/ebus_handler_SUITE.erl
index bcae016..b1a641f 100644
--- a/test/ebus_handler_SUITE.erl
+++ b/test/ebus_handler_SUITE.erl
@@ -26,7 +26,6 @@
 all() -> [t_handler, t_callback_handler].
 
 init_per_suite(Config) ->
-  ebus:stop(),
   ebus:start(),
   Config.