diff --git a/examples/echo_server/echo_server.cpp b/examples/echo_server/echo_server.cpp
index d67a242b3c..0e694f69e6 100644
--- a/examples/echo_server/echo_server.cpp
+++ b/examples/echo_server/echo_server.cpp
@@ -78,13 +78,13 @@ int main(int argc, char* argv[]) {
 		plain_handler_ptr h(new echo_server_handler());
 		plain_endpoint_type e(h);
 		
-		e.alog().set_level(websocketpp::log::alevel::ALL);
+		e.alog().unset_level(websocketpp::log::alevel::ALL);
 		//e.alog().unset_level(websocketpp::log::alevel::ALL);
 		//e.alog().set_level(websocketpp::log::alevel::CONNECT);
 		//e.alog().set_level(websocketpp::log::alevel::DISCONNECT);
 		//e.alog().unset_level(websocketpp::log::alevel::DEBUG_HANDSHAKE);
 		
-		e.elog().set_level(websocketpp::log::elevel::ALL);
+		e.elog().unset_level(websocketpp::log::elevel::ALL);
 		//e.elog().unset_level(websocketpp::log::elevel::ALL);
 		//e.elog().set_level(websocketpp::log::elevel::ERROR);
 		//e.elog().set_level(websocketpp::log::elevel::FATAL);
diff --git a/examples/echo_server_tls/echo_server_tls.cpp b/examples/echo_server_tls/echo_server_tls.cpp
index 483de978c8..b5de89d085 100644
--- a/examples/echo_server_tls/echo_server_tls.cpp
+++ b/examples/echo_server_tls/echo_server_tls.cpp
@@ -75,13 +75,11 @@ public:
 		//std::cout << "connection closed" << std::endl;
 	}
 	
-	void on_message(connection_ptr connection,websocketpp::utf8_string_ptr msg) {
+	void on_message(connection_ptr connection,websocketpp::message::data_ptr msg) {
 		//std::cout << "got message: " << *msg << std::endl;
-		connection->send(*msg);
-	}
-	void on_message(connection_ptr connection,websocketpp::binary_string_ptr data) {
-		//std::cout << "got binary message of length: " << data->size() << std::endl;
-		connection->send(*data);
+		connection->send(msg->get_payload(),(msg->get_opcode() == websocketpp::frame::opcode::BINARY));
+		
+		connection->recycle(msg);
 	}
 	
 	void http(connection_ptr connection) {
@@ -114,15 +112,15 @@ int main(int argc, char* argv[]) {
 			tls_endpoint_type e(h);
 			
 			e.alog().unset_level(websocketpp::log::alevel::ALL);
-			e.alog().set_level(websocketpp::log::alevel::CONNECT);
-			e.alog().set_level(websocketpp::log::alevel::DISCONNECT);
-			e.alog().set_level(websocketpp::log::alevel::DEVEL);
-			e.alog().set_level(websocketpp::log::alevel::DEBUG_CLOSE);
+			//e.alog().set_level(websocketpp::log::alevel::CONNECT);
+			//e.alog().set_level(websocketpp::log::alevel::DISCONNECT);
+			//e.alog().set_level(websocketpp::log::alevel::DEVEL);
+			//e.alog().set_level(websocketpp::log::alevel::DEBUG_CLOSE);
 			//e.alog().unset_level(websocketpp::log::alevel::DEBUG_HANDSHAKE);
 			
 			e.elog().unset_level(websocketpp::log::elevel::ALL);
-			e.elog().set_level(websocketpp::log::elevel::ERROR);
-			e.elog().set_level(websocketpp::log::elevel::FATAL);
+			//e.elog().set_level(websocketpp::log::elevel::ERROR);
+			//e.elog().set_level(websocketpp::log::elevel::FATAL);
 			
 			std::cout << "Starting Secure WebSocket echo server on port " << port << std::endl;
 			e.listen(port);
@@ -131,13 +129,13 @@ int main(int argc, char* argv[]) {
 			plain_endpoint_type e(h);
 			
 			e.alog().unset_level(websocketpp::log::alevel::ALL);
-			e.alog().set_level(websocketpp::log::alevel::CONNECT);
-			e.alog().set_level(websocketpp::log::alevel::DISCONNECT);
+			//e.alog().set_level(websocketpp::log::alevel::CONNECT);
+			//e.alog().set_level(websocketpp::log::alevel::DISCONNECT);
 			//e.alog().unset_level(websocketpp::log::alevel::DEBUG_HANDSHAKE);
 			
 			e.elog().unset_level(websocketpp::log::elevel::ALL);
-			e.elog().set_level(websocketpp::log::elevel::ERROR);
-			e.elog().set_level(websocketpp::log::elevel::FATAL);
+			//e.elog().set_level(websocketpp::log::elevel::ERROR);
+			//e.elog().set_level(websocketpp::log::elevel::FATAL);
 			
 			// TODO: fix
 			//e.alog().set_level(websocketpp::log::alevel::CONNECT & websocketpp::log::alevel::DISCONNECT);