diff --git a/MQTTSNGateway/Makefile b/MQTTSNGateway/Makefile
index 6b9c630..7e096e9 100644
--- a/MQTTSNGateway/Makefile
+++ b/MQTTSNGateway/Makefile
@@ -18,18 +18,6 @@ OS := linux
 SENSORNET := udp
 TEST := tests
 
-# include directories, for MacOS/homebrew add -I/usr/local/opt/openssl/include/
-# library search paths, for MacOS/homebrew add -L/usr/local/opt/openssl/lib/
-ifeq ($(shell) uname),Darwin)
-	CXX := clang++
-	INCLUDE := -I/usr/local/opt/openssl/include/
-	LIB := -L/usr/local/opt/openssl/lib/
-else
-	CXX := g++
-	INCLUDE :=
-	LIB :=
-endif
-
 INSTALL_DIR=../../
 CONFIG_DIR=../../
 
@@ -88,17 +76,21 @@ $(SUBDIR)/MQTTSNUnsubscribeServer.c
 
 CPPFLAGS += 
 
+INCLUDE :=
 INCLUDES += $(INCLUDE) -I$(SRCDIR) \
 -I$(SRCDIR)/$(OS) \
 -I$(SRCDIR)/$(OS)/$(SENSORNET) \
 -I$(SUBDIR) \
--I$(SRCDIR)/$(TEST)
+-I$(SRCDIR)/$(TEST) \
+-I/usr/local/opt/openssl/include/
 
 # preprocessor defines
 DEFS :=
 
+CXX := g++
 
-LIBS += $(LIB) -L/usr/local/lib
+LIB :=
+LIBS += $(LIB) -L/usr/local/lib -L/usr/local/opt/openssl/lib/
 
 LDFLAGS :=
 CXXFLAGS := -Wall -O3 -std=c++11
diff --git a/MQTTSNGateway/src/MQTTSNGWBrokerSendTask.cpp b/MQTTSNGateway/src/MQTTSNGWBrokerSendTask.cpp
index d8211e6..ff58a8d 100644
--- a/MQTTSNGateway/src/MQTTSNGWBrokerSendTask.cpp
+++ b/MQTTSNGateway/src/MQTTSNGWBrokerSendTask.cpp
@@ -41,7 +41,7 @@ BrokerSendTask::BrokerSendTask(Gateway* gateway)
 
 BrokerSendTask::~BrokerSendTask()
 {
-	WRITELOG("BrokerSendTask is deleted normally.\r\n");
+//	WRITELOG("BrokerSendTask is deleted normally.\r\n");
 }
 
 /**
diff --git a/MQTTSNGateway/src/MQTTSNGWClientSendTask.cpp b/MQTTSNGateway/src/MQTTSNGWClientSendTask.cpp
index cd45b1d..b0af063 100644
--- a/MQTTSNGateway/src/MQTTSNGWClientSendTask.cpp
+++ b/MQTTSNGateway/src/MQTTSNGWClientSendTask.cpp
@@ -35,7 +35,7 @@ ClientSendTask::ClientSendTask(Gateway* gateway)
 
 ClientSendTask::~ClientSendTask()
 {
-	WRITELOG("ClientSendTask is deleted normally.\r\n");
+//	WRITELOG("ClientSendTask is deleted normally.\r\n");
 }
 
 void ClientSendTask::run()
diff --git a/MQTTSNGateway/src/MQTTSNGateway.cpp b/MQTTSNGateway/src/MQTTSNGateway.cpp
index 1393dfb..6ed0c04 100644
--- a/MQTTSNGateway/src/MQTTSNGateway.cpp
+++ b/MQTTSNGateway/src/MQTTSNGateway.cpp
@@ -114,7 +114,7 @@ Gateway::~Gateway()
 	{
 		delete _topics;
 	}
-    WRITELOG("Gateway        is deleted normally.\r\n");
+//    WRITELOG("Gateway        is deleted normally.\r\n");
 }
 
 int Gateway::getParam(const char* parameter, char* value)