diff --git a/README.md b/README.md
index 07a02d143a9e8e872b03ddaead8f41f8d2d0a546..d777bd7a5103c2cfe128c73c618d62b510333465 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
-Tsūru [![hex.pm version](https://img.shields.io/hexpm/v/tsuru.svg)](https://hex.pm/packages/tsuru)
+Tsūru
 =====
 
-[![build status](https://gitlab.hedenstroem.com/ci/projects/6/status.png?ref=master)](https://gitlab.hedenstroem.com/ci/projects/6?ref=master)
+[![hex.pm version](https://img.shields.io/hexpm/v/tsuru.svg)](https://hex.pm/packages/tsuru)
+
+[![build status](https://gitlab.hedenstroem.com/ci/projects/21/status.png?ref=master)](https://gitlab.hedenstroem.com/ci/projects/21?ref=master)
 
 A collection of useful tools for Erlang applications
diff --git a/src/tsuru_mdns.erl b/src/tsuru_mdns.erl
index 9fecae10ff858ee2f1ee11e909d6b31b2b50d196..d16ac5efe7784918508bc06a4bf2366813a65565 100644
--- a/src/tsuru_mdns.erl
+++ b/src/tsuru_mdns.erl
@@ -7,12 +7,16 @@
 -define(MDNS_PORT, 5353).
 
 %% API
--export([publish_broker/3, discover_brokers/1, discover_brokers/2]).
+-export([start_link/3, publish_broker/3, discover_brokers/1, discover_brokers/2]).
 
 %% Exported types
 -export_type([brokers/0]).
 -type brokers() :: [{Address :: string(), Port :: inet:port_number()}].
 
+-spec(start_link(Domain :: string(), Address :: string(), Port :: inet:port_number()) -> {ok, Pid :: pid()}).
+start_link(Domain, Address, Port) ->
+    {ok, publish_broker(Domain, Address, Port)}.
+
 -spec(publish_broker(Domain :: string(), Address :: string(), Port :: inet:port_number()) ->
     {ok, Pid :: pid()} |
     {error, Reason :: inet:posix()}).
diff --git a/test/tsuru_mdns_test.erl b/test/tsuru_mdns_test.erl
index fe965a313652c4b4aed63ee93b7e8d21ef6b98c8..fc2374a0f9e71f0989d38895dbe3c7b45300bfda 100644
--- a/test/tsuru_mdns_test.erl
+++ b/test/tsuru_mdns_test.erl
@@ -7,7 +7,7 @@ publish_test() ->
     {ok, NoBrokers} = tsuru_mdns:discover_brokers("_test._tcp.local", 1000),
     ?assertEqual(NoBrokers, []),
     tsuru_mdns:publish_broker("_test._tcp.local", "0.0.0.0", 8080),
-    Pid = tsuru_mdns:publish_broker("_test._tcp.local", "127.0.0.1", 8081),
+    {ok, _Pid} = tsuru_mdns:start_link("_test._tcp.local", "127.0.0.1", 8081),
     tsuru_mdns:publish_broker("_other._tcp.local", "0.0.0.0", 8082),
     {ok, TestBrokers} = tsuru_mdns:discover_brokers("_test._tcp.local"),
     ?assert(proplists:is_defined("127.0.0.1", TestBrokers)),