diff --git a/lib/httparrot.ex b/lib/httparrot.ex
index c9f250f..dc85904 100644
--- a/lib/httparrot.ex
+++ b/lib/httparrot.ex
@@ -25,7 +25,8 @@ defmodule HTTParrot do
              {'/html', :cowboy_static, {:priv_file, :httparrot, "html.html"}},
              {'/deny', HTTParrot.DenyHandler, []},
              {'/robots.txt', HTTParrot.RobotsHandler, []},
-             {'/base64/:value', HTTParrot.Base64Handler, []} ] }
+             {'/base64/:value', HTTParrot.Base64Handler, []},
+             {'/websocket', HTTParrot.WebsocketHandler, []} ] }
     ])
     {:ok, http_port} = :application.get_env(:httparrot, :http_port)
     ssl = :application.get_env(:httparrot, :ssl, false)
diff --git a/lib/httparrot/websocket_handler.ex b/lib/httparrot/websocket_handler.ex
new file mode 100644
index 0000000..bd65daa
--- /dev/null
+++ b/lib/httparrot/websocket_handler.ex
@@ -0,0 +1,15 @@
+defmodule HTTParrot.WebsocketHandler do
+  @behaviour :cowboy_websocket_handler
+  @moduledoc """
+  Echo given messages through websocket connection
+  """
+
+  def init(_transport, _req, _opts), do: {:upgrade, :protocol, :cowboy_websocket}
+  def websocket_init(_transport, req, _opts), do: {:ok, req, nil}
+
+  def websocket_handle({:text, text}, req, state), do: {:reply, {:text, text}, req, state}
+  def websocket_handle({:binary, binary}, req, state), do: {:reply, {:binary, binary}, req, state}
+  def websocket_info(_info, req, state), do: {:ok, req, state}
+
+  def websocket_terminate(_reason, _req, _state), do: :ok
+end