diff --git a/spdlog_udp/CMakeLists.txt b/spdlog_udp/CMakeLists.txt
index fee601f..1bc1e34 100644
--- a/spdlog_udp/CMakeLists.txt
+++ b/spdlog_udp/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1)
 
 project(spdlog_udp)
 
-include_directories(/usr/local/include)
+include_directories(/usr/local/include /usr/local/include/spdlog )
 
 set (spdlog_udp_SRC
     udp.cpp
diff --git a/spdlog_udp/udp.cpp b/spdlog_udp/udp.cpp
index 6743e91..4cb0b4e 100644
--- a/spdlog_udp/udp.cpp
+++ b/spdlog_udp/udp.cpp
@@ -1,5 +1,5 @@
 #include <spdlog/spdlog.h>
-#include "udp_sink.h"
+#include <spdlog/sinks/udp_sink.h>
 #include <thread>
 #include <condition_variable>
 #include <chrono>
@@ -100,7 +100,7 @@ int main(int argc, char **argv)
         case 'i':
             ipAddr = optarg;
             break;
-        case 's':
+        case 'p':
             port = static_cast<uint16_t>(std::stoi(optarg));
             break;
         case '?':
diff --git a/spdlog_udp/udp_client.h b/spdlog_udp/udp_client.h
deleted file mode 100644
index e006e15..0000000
--- a/spdlog_udp/udp_client.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-
-#pragma once
-
-#ifdef _WIN32
-#error include udp_client-windows.h instead
-#endif
-
-// udp client helper
-#include <spdlog/common.h>
-#include <spdlog/details/os.h>
-
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <netdb.h>
-#include <netinet/tcp.h>
-
-#include <string>
-
-namespace spdlog {
-namespace details {
-class udp_client
-{
-    int socket_ = -1;
-    struct sockaddr_in sockAddr_;
-public:
-
-    bool init(const std::string &host, uint16_t port)
-    {
-        socket_ = socket(PF_INET, SOCK_DGRAM, 0);
-        if (socket_ < 0)
-        {
-            throw_spdlog_ex("error: Create Socket Failed!");
-            return false;
-        }
-
-        sockAddr_.sin_family = AF_INET;
-        sockAddr_.sin_port = htons(port);
-        inet_aton(host.c_str(), &sockAddr_.sin_addr);
-
-        memset(sockAddr_.sin_zero, 0x00, sizeof(sockAddr_.sin_zero));
-        return true;
-    }
-
-    bool is_init() const
-    {
-        return socket_ != -1;
-    }
-
-    void close()
-    {
-        if (is_init())
-        {
-            ::close(socket_);
-            socket_ = -1;
-        }
-    }
-
-    int fd() const
-    {
-        return socket_;
-    }
-
-    ~udp_client()
-    {
-        close();
-    }
-
-    // Send exactly n_bytes of the given data.
-    // On error close the connection and throw.
-    void send(const char *data, size_t n_bytes)
-    {
-        ssize_t toslen = 0;
-        socklen_t tolen = sizeof(struct sockaddr);
-        if (( toslen = sendto(socket_, data, n_bytes, 0, (struct sockaddr *)&sockAddr_, tolen)) == -1)
-        {
-            throw_spdlog_ex("write(2) failed", errno);
-            close();
-        }
-    }
-};
-} // namespace details
-} // namespace spdlog
\ No newline at end of file
diff --git a/spdlog_udp/udp_client_windows.h b/spdlog_udp/udp_client_windows.h
deleted file mode 100644
index 239095a..0000000
--- a/spdlog_udp/udp_client_windows.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-
-#pragma once
-
-#define WIN32_LEAN_AND_MEAN
-// tcp client helper
-#include <spdlog/common.h>
-#include <spdlog/details/os.h>
-
-#ifdef _WIN32
-#include <winsock2.h>
-#include <windows.h>
-#include <ws2tcpip.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string>
-
-#pragma comment(lib, "Ws2_32.lib")
-#pragma comment(lib, "Mswsock.lib")
-#pragma comment(lib, "AdvApi32.lib")
-
-namespace spdlog {
-namespace details {
-class udp_client
-{
-    SOCKET socket_ = INVALID_SOCKET;
-    sockaddr_in addr_ = { 0 };
-
-    static bool winsock_initialized_()
-    {
-        SOCKET s = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
-        if (s == INVALID_SOCKET)
-        {
-            return false;
-        }
-        else
-        {
-            closesocket(s);
-            return true;
-        }
-    }
-
-    static void init_winsock_()
-    {
-        WSADATA wsaData;
-        auto rv = WSAStartup(MAKEWORD(2, 2), &wsaData);
-        if (rv != 0)
-        {
-            throw_winsock_error_("WSAStartup failed", ::WSAGetLastError());
-        }
-    }
-
-    static void throw_winsock_error_(const std::string &msg, int last_error)
-    {
-        char buf[512];
-        ::FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, last_error,
-            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, (sizeof(buf) / sizeof(char)), NULL);
-
-        throw_spdlog_ex(fmt::format("tcp_sink - {}: {}", msg, buf));
-    }
-
-public:
-    bool is_init() const
-    {
-        return socket_ != INVALID_SOCKET;
-    }
-
-    bool init(const std::string &host, uint16_t port)
-    {
-        // initialize winsock if needed
-        if (!winsock_initialized_())
-        {
-            init_winsock_();
-        }
-
-        if (is_init())
-        {
-            close();
-        }
-
-        addr_.sin_family = AF_INET;
-        addr_.sin_port = htons(port);
-        InetPton(AF_INET, TEXT(host.c_str()), &addr_.sin_addr.s_addr);
-        return true;
-    }
-
-    void close()
-    {
-        ::closesocket(socket_);
-        socket_ = INVALID_SOCKET;
-        WSACleanup();
-    }
-
-    SOCKET fd() const
-    {
-        return socket_;
-    }
-
-    ~udp_client()
-    {
-        close();
-    }
-
-    void send(const char *data, size_t n_bytes)
-    {
-        if ((sendto(socket_, data, n_bytes, 0, (struct sockaddr *)&addr_, sizeof(struct sockaddr))) == -1)
-        {
-            throw_spdlog_ex("write(2) failed", errno);
-            close();
-        }
-    }
-};
-} // namespace details
-} // namespace spdlog
-
-#endif
\ No newline at end of file
diff --git a/spdlog_udp/udp_sink.h b/spdlog_udp/udp_sink.h
deleted file mode 100644
index 5b87945..0000000
--- a/spdlog_udp/udp_sink.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-
-#pragma once
-
-#include <spdlog/common.h>
-#include <spdlog/sinks/base_sink.h>
-#include <spdlog/details/null_mutex.h>
-#ifdef _WIN32
-//#include <spdlog/details/udp_client-windows.h>
-#include "udp_client-windows.h"
-#else
-//#include <spdlog/details/udp_client.h>
-#include "udp_client.h"
-#endif
-
-#include <mutex>
-#include <string>
-#include <chrono>
-#include <functional>
-
-#pragma once
-
-// Simple tcp client sink
-// Connects to remote address and send the formatted log.
-// Will attempt to reconnect if connection drops.
-// If more complicated behaviour is needed (i.e get responses), you can inherit it and override the sink_it_ method.
-
-namespace spdlog {
-namespace sinks {
-
-struct udp_sink_config
-{
-    std::string server_host;
-    uint16_t server_port;
-
-    udp_sink_config(std::string host, uint16_t port)
-        : server_host{std::move(host)}
-        , server_port{port}
-    {}
-};
-
-template<typename Mutex>
-class udp_sink : public spdlog::sinks::base_sink<Mutex>
-{
-public:
-    // connect to tcp host/port or throw if failed
-    // host can be hostname or ip address
-
-    explicit udp_sink(udp_sink_config sink_config)
-        : config_{std::move(sink_config)}
-    {
-
-    }
-
-    ~udp_sink() override = default;
-
-protected:
-    void sink_it_(const spdlog::details::log_msg &msg) override
-    {
-        spdlog::memory_buf_t formatted;
-        spdlog::sinks::base_sink<Mutex>::formatter_->format(msg, formatted);
-        if (!client_.is_init())
-        {
-            client_.init(config_.server_host, config_.server_port);
-        }
-        client_.send(formatted.data(), formatted.size());
-    }
-
-    void flush_() override {}
-    udp_sink_config config_;
-    details::udp_client client_;
-};
-
-using udp_sink_mt = udp_sink<std::mutex>;
-using udp_sink_st = udp_sink<spdlog::details::null_mutex>;
-
-} // namespace sinks
-
-//
-// factory functions
-//
-template<typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> udp_logger_mt(const std::string &logger_name, sinks::udp_sink_config skin_config)
-{
-    return Factory::template create<sinks::udp_sink_mt>(logger_name, skin_config);
-}
-
-} // namespace spdlog
\ No newline at end of file