diff --git a/Daemon.cpp b/Daemon.cpp
index a5084194..b345d2a8 100644
--- a/Daemon.cpp
+++ b/Daemon.cpp
@@ -42,7 +42,7 @@ namespace i2p
 			std::unique_ptr<i2p::client::I2PControlService> m_I2PControlService;
 			std::unique_ptr<i2p::transport::UPnP> UPnP;
 #ifdef WITH_EVENTS
-      std::unique_ptr<i2p::event::WebsocketServer> m_WebsocketServer;
+			std::unique_ptr<i2p::event::WebsocketServer> m_WebsocketServer;
 #endif
 		};
 
@@ -298,23 +298,25 @@ namespace i2p
 			}
 #ifdef WITH_EVENTS
 
-      bool websocket; i2p::config::GetOption("websockets.enabled", websocket);
-      if(websocket) {
-      	std::string websocketAddr; i2p::config::GetOption("websockets.address", websocketAddr);
-				uint16_t    websocketPort; i2p::config::GetOption("websockets.port",    websocketPort);
+			bool websocket; i2p::config::GetOption("websockets.enabled", websocket);
+			if(websocket) {
+				std::string websocketAddr; i2p::config::GetOption("websockets.address", websocketAddr);
+				uint16_t		websocketPort; i2p::config::GetOption("websockets.port",		websocketPort);
 				LogPrint(eLogInfo, "Daemon: starting Websocket server at ", websocketAddr, ":", websocketPort);
 				d.m_WebsocketServer = std::unique_ptr<i2p::event::WebsocketServer>(new i2p::event::WebsocketServer (websocketAddr, websocketPort));
-        d.m_WebsocketServer->Start();
-        i2p::event::core.SetListener(d.m_WebsocketServer->ToListener());
-      }
-      
-#endif      
+				d.m_WebsocketServer->Start();
+				i2p::event::core.SetListener(d.m_WebsocketServer->ToListener());
+			}
+			
+#endif
 			return true;
 		}
 
 		bool Daemon_Singleton::stop()
 		{
-      i2p::event::core.SetListener(nullptr);
+#ifdef WITH_EVENTS
+			i2p::event::core.SetListener(nullptr);
+#endif
 			LogPrint(eLogInfo, "Daemon: shutting down");
 			LogPrint(eLogInfo, "Daemon: stopping Client");
 			i2p::client::context.Stop();
@@ -342,15 +344,15 @@ namespace i2p
 				d.m_I2PControlService = nullptr;
 			}
 #ifdef WITH_EVENTS
-      if (d.m_WebsocketServer) {
-        LogPrint(eLogInfo, "Daemon: stopping Websocket server");
-        d.m_WebsocketServer->Stop();
-        d.m_WebsocketServer = nullptr;
-      }
+			if (d.m_WebsocketServer) {
+				LogPrint(eLogInfo, "Daemon: stopping Websocket server");
+				d.m_WebsocketServer->Stop();
+				d.m_WebsocketServer = nullptr;
+			}
 #endif
 			i2p::crypto::TerminateCrypto ();
 
 			return true;
 		}
-    }
+}
 }
diff --git a/Event.cpp b/Event.cpp
index 45e4e09c..72fcc751 100644
--- a/Event.cpp
+++ b/Event.cpp
@@ -3,26 +3,28 @@
 
 namespace i2p
 {
-  namespace event
-  {
-    EventCore core;
+	namespace event
+	{
+		EventCore core;
 
-    void EventCore::SetListener(EventListener * l)
-    {
-      m_listener = l;
-      LogPrint(eLogInfo, "Event: listener set");
-    }
+		void EventCore::SetListener(EventListener * l)
+		{
+			m_listener = l;
+			LogPrint(eLogInfo, "Event: listener set");
+		}
 
-    void EventCore::QueueEvent(const EventType & ev)
-    {
-      if(m_listener)
-        m_listener->HandleEvent(ev);
-    }
-  }
+		void EventCore::QueueEvent(const EventType & ev)
+		{
+			if(m_listener)
+				m_listener->HandleEvent(ev);
+		}
+	}
 }
 
 void EmitEvent(const EventType & e)
 {
-  i2p::event::core.QueueEvent(e);
+#ifdef WITH_EVENTS
+	i2p::event::core.QueueEvent(e);
+#endif
 }
 
diff --git a/Event.h b/Event.h
index e9830289..be57d7bf 100644
--- a/Event.h
+++ b/Event.h
@@ -10,26 +10,26 @@ typedef std::map<std::string, std::string> EventType;
 
 namespace i2p
 {
-  namespace event
-  {
-    class EventListener  {
-    public:
-      virtual ~EventListener() {};
-      virtual void HandleEvent(const EventType & ev) = 0;
-    };
+	namespace event
+	{
+		class EventListener	 {
+		public:
+			virtual ~EventListener() {};
+			virtual void HandleEvent(const EventType & ev) = 0;
+		};
 
-    class EventCore
-    {
-    public:
-      void QueueEvent(const EventType & ev);
-      void SetListener(EventListener * l);
-      
-    private:
-      EventListener * m_listener = nullptr;
-    };
-    
-    extern EventCore core;
-  }
+		class EventCore
+		{
+		public:
+			void QueueEvent(const EventType & ev);
+			void SetListener(EventListener * l);
+			
+		private:
+			EventListener * m_listener = nullptr;
+		};
+		
+		extern EventCore core;
+	}
 }
 
 void EmitEvent(const EventType & ev);
diff --git a/Makefile b/Makefile
index e3707c09..f6d117fa 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ USE_MESHNET := no
 USE_UPNP   := no
 
 
-ifeq ($(WEBSOCKET),1)
+ifeq ($(WEBSOCKETS),1)
 	NEEDED_CXXFLAGS += -DWITH_EVENTS
 	DAEMON_SRC += Websocket.cpp
 endif
diff --git a/NTCPSession.cpp b/NTCPSession.cpp
index 876b8a4c..e68feb75 100644
--- a/NTCPSession.cpp
+++ b/NTCPSession.cpp
@@ -605,10 +605,10 @@ namespace transport
 			if (!memcmp (m_NextMessage->buf + m_NextMessageOffset - 4, checksum, 4))
 			{
 				if (!m_NextMessage->IsExpired ())
-        {
-          EmitEvent({{"type", "transport.recvmsg"} , {"ident", GetIdentHashBase64()}, {"number", "1"}});
+				{
+					EmitEvent({{"type", "transport.recvmsg"} , {"ident", GetIdentHashBase64()}, {"number", "1"}});
 					m_Handler.PutNextMessage (m_NextMessage);
-        }
+				}
 				else
 					LogPrint (eLogInfo, "NTCP: message expired");
 			}	
diff --git a/SSUData.cpp b/SSUData.cpp
index 3bff01c3..5e9a62ab 100644
--- a/SSUData.cpp
+++ b/SSUData.cpp
@@ -234,11 +234,11 @@ namespace transport
 					if (!m_ReceivedMessages.count (msgID))
 					{	
 						m_ReceivedMessages.insert (msgID);
-						m_LastMessageReceivedTime = i2p::util::GetSinceEpoch<Time> ();
+						m_LastMessageReceivedTime = i2p::util::GetSecondsSinceEpoch ();
 						if (!msg->IsExpired ()) {
-              EmitEvent({{"type", "transport.recvmsg"} , {"ident", m_Session.GetIdentHashBase64()}, {"number", "1"}});
+							EmitEvent({{"type", "transport.recvmsg"} , {"ident", m_Session.GetIdentHashBase64()}, {"number", "1"}});
 							m_Handler.PutNextMessage (msg);
-            }
+						}
 						else
 							LogPrint (eLogDebug, "SSU: message expired");
 					}	
diff --git a/TransportSession.h b/TransportSession.h
index 78533df9..5d5468cf 100644
--- a/TransportSession.h
+++ b/TransportSession.h
@@ -65,8 +65,8 @@ namespace transport
 			virtual ~TransportSession () {};
 			virtual void Done () = 0;
 
-      std::string GetIdentHashBase64() const { return m_RemoteIdentity->GetIdentHash().ToBase64(); }
-      
+			std::string GetIdentHashBase64() const { return m_RemoteIdentity->GetIdentHash().ToBase64(); }
+			
 			std::shared_ptr<const i2p::data::IdentityEx> GetRemoteIdentity () { return m_RemoteIdentity; };
 			void SetRemoteIdentity (std::shared_ptr<const i2p::data::IdentityEx> ident) { m_RemoteIdentity = ident; };
 			
diff --git a/Transports.cpp b/Transports.cpp
index 9efd8bb3..63dc4f95 100644
--- a/Transports.cpp
+++ b/Transports.cpp
@@ -231,8 +231,7 @@ namespace transport
 
 	void Transports::SendMessages (const i2p::data::IdentHash& ident, const std::vector<std::shared_ptr<i2p::I2NPMessage> >& msgs)
 	{
-    
-    EmitEvent({{"type" , "transport.sendmsg"}, {"ident", ident.ToBase64()}, {"number", std::to_string(msgs.size())}});
+		EmitEvent({{"type" , "transport.sendmsg"}, {"ident", ident.ToBase64()}, {"number", std::to_string(msgs.size())}});
 		m_Service.post (std::bind (&Transports::PostMessages, this, ident, msgs));
 	}	
 
@@ -507,10 +506,9 @@ namespace transport
 		}
 		if (m_SSUServer)
 		{
-                        bool nat;  i2p::config::GetOption("nat", nat);
-                        if (nat)
-                            i2p::context.SetStatus (eRouterStatusTesting);
-
+			bool nat;	 i2p::config::GetOption("nat", nat);
+			if (nat)
+				i2p::context.SetStatus (eRouterStatusTesting);
 			for (int i = 0; i < 5; i++)
 			{
 				auto router = i2p::data::netdb.GetRandomPeerTestRouter ();
@@ -569,11 +567,10 @@ namespace transport
 			auto remoteIdentity = session->GetRemoteIdentity (); 
 			if (!remoteIdentity) return;
 			auto ident = remoteIdentity->GetIdentHash ();
-    	auto it = m_Peers.find (ident);
+			auto it = m_Peers.find (ident);
 			if (it != m_Peers.end ())
 			{
-        EmitEvent({{"type" , "transport.connected"}, {"ident", ident.ToBase64()}, {"inbound", "false"}});
-          
+				EmitEvent({{"type" , "transport.connected"}, {"ident", ident.ToBase64()}, {"inbound", "false"}});
 				bool sendDatabaseStore = true;
 				if (it->second.delayedMessages.size () > 0)
 				{
@@ -599,22 +596,22 @@ namespace transport
 					session->Done();
 					return;
 				}
-        EmitEvent({{"type" , "transport.connected"}, {"ident", ident.ToBase64()}, {"inbound", "true"}});
+				EmitEvent({{"type" , "transport.connected"}, {"ident", ident.ToBase64()}, {"inbound", "true"}});
 				session->SendI2NPMessages ({ CreateDatabaseStoreMsg () }); // send DatabaseStore
 				std::unique_lock<std::mutex>	l(m_PeersMutex);	
 				m_Peers.insert (std::make_pair (ident, Peer{ 0, nullptr, { session }, i2p::util::GetSecondsSinceEpoch (), {} }));
 			}
-		});			
+		});
 	}
 		
 	void Transports::PeerDisconnected (std::shared_ptr<TransportSession> session)
 	{
 		m_Service.post([session, this]()
-		{	 
+		{
 			auto remoteIdentity = session->GetRemoteIdentity (); 
 			if (!remoteIdentity) return;
 			auto ident = remoteIdentity->GetIdentHash ();
-      EmitEvent({{"type" , "transport.disconnected"}, {"ident", ident.ToBase64()}});
+			EmitEvent({{"type" , "transport.disconnected"}, {"ident", ident.ToBase64()}});
 			auto it = m_Peers.find (ident);
 			if (it != m_Peers.end ())
 			{
@@ -678,13 +675,13 @@ namespace transport
 		std::advance (it, rand () % m_Peers.size ());	
 		return it != m_Peers.end () ? it->second.router : nullptr;
 	}
-  void Transports::RestrictRoutesToFamilies(std::set<std::string> families)
-  {
-    std::lock_guard<std::mutex> lock(m_FamilyMutex);
-    m_TrustedFamilies.clear();
-    for ( const auto& fam : families )
-      m_TrustedFamilies.push_back(fam);
-  }
+	void Transports::RestrictRoutesToFamilies(std::set<std::string> families)
+	{
+		std::lock_guard<std::mutex> lock(m_FamilyMutex);
+		m_TrustedFamilies.clear();
+		for ( const auto& fam : families )
+			m_TrustedFamilies.push_back(fam);
+	}
 
 	void Transports::RestrictRoutesToRouters(std::set<i2p::data::IdentHash> routers)
 	{
@@ -694,14 +691,14 @@ namespace transport
 			m_TrustedRouters.push_back(ri);
 	}
 	
-  bool Transports::RoutesRestricted() const {
-    std::unique_lock<std::mutex> famlock(m_FamilyMutex);
+	bool Transports::RoutesRestricted() const {
+		std::unique_lock<std::mutex> famlock(m_FamilyMutex);
 		std::unique_lock<std::mutex> routerslock(m_TrustedRoutersMutex);
-    return m_TrustedFamilies.size() > 0 || m_TrustedRouters.size() > 0;
-  }
+		return m_TrustedFamilies.size() > 0 || m_TrustedRouters.size() > 0;
+	}
 
-  /** XXX: if routes are not restricted this dies */
-  std::shared_ptr<const i2p::data::RouterInfo> Transports::GetRestrictedPeer() const
+	/** XXX: if routes are not restricted this dies */
+	std::shared_ptr<const i2p::data::RouterInfo> Transports::GetRestrictedPeer() const
 	{
 		{
 			std::lock_guard<std::mutex> l(m_FamilyMutex);
@@ -734,7 +731,7 @@ namespace transport
 			}
 		}
 		return nullptr;
-  }
+	}
 
 	bool Transports::IsRestrictedPeer(const i2p::data::IdentHash & ih) const
 	{
diff --git a/Tunnel.cpp b/Tunnel.cpp
index 5c0de1ea..77e003d1 100644
--- a/Tunnel.cpp
+++ b/Tunnel.cpp
@@ -11,6 +11,7 @@
 #include "Transports.h"
 #include "NetDb.h"
 #include "Tunnel.h"
+#include "TunnelPool.h"
 
 namespace i2p
 {
@@ -30,7 +31,7 @@ namespace tunnel
 	void Tunnel::Build (uint32_t replyMsgID, std::shared_ptr<OutboundTunnel> outboundTunnel)
 	{
 #ifdef WITH_EVENTS
-    std::string peers = i2p::context.GetIdentity()->GetIdentHash().ToBase64();
+		std::string peers = i2p::context.GetIdentity()->GetIdentHash().ToBase64();
 #endif
 		auto numHops = m_Config->GetNumHops ();
 		int numRecords = numHops <= STANDARD_NUM_RECORDS ? STANDARD_NUM_RECORDS : numHops; 
@@ -58,14 +59,13 @@ namespace tunnel
 			hop->recordIndex = idx; 
 			i++;
 #ifdef WITH_EVENTS
-      peers += ":" + hop->ident->GetIdentHash().ToBase64();
+			peers += ":" + hop->ident->GetIdentHash().ToBase64();
 #endif
 			hop = hop->next;
 		}
 #ifdef WITH_EVENTS
-    EmitTunnelEvent("tunnel.build", this, peers);
+		EmitTunnelEvent("tunnel.build", this, peers);
 #endif
-    
 		// fill up fake records with random data
 		for (int i = numHops; i < numRecords; i++)
 		{
@@ -191,12 +191,12 @@ namespace tunnel
 		return ret;
 	}
 
-  void Tunnel::SetState(TunnelState state)
-  {
-    m_State = state;
-    EmitTunnelEvent("tunnel.state", this, state);
-  }
-  
+	void Tunnel::SetState(TunnelState state)
+	{
+		m_State = state;
+		EmitTunnelEvent("tunnel.state", this, state);
+	}
+	
 
 	void Tunnel::PrintHops (std::stringstream& s) const
 	{
@@ -599,7 +599,7 @@ namespace tunnel
 							}
 						}
 						if(pool) pool->OnTunnelBuildResult(tunnel, eBuildResultTimeout);
-            EmitTunnelEvent("tunnel.state", tunnel.get(), eTunnelStateBuildFailed);
+						EmitTunnelEvent("tunnel.state", tunnel.get(), eTunnelStateBuildFailed);
 						// delete
 						it = pendingTunnels.erase (it);
 						m_NumFailedTunnelCreations++;
@@ -611,7 +611,7 @@ namespace tunnel
 					LogPrint (eLogDebug, "Tunnel: pending build request ", it->first, " failed, deleted");
 
 					if(pool) pool->OnTunnelBuildResult(tunnel, eBuildResultRejected);
-          EmitTunnelEvent("tunnel.state", tunnel.get(), eTunnelStateBuildFailed);
+					EmitTunnelEvent("tunnel.state", tunnel.get(), eTunnelStateBuildFailed);
 
 					it = pendingTunnels.erase (it);
 					m_NumFailedTunnelCreations++;
@@ -800,7 +800,7 @@ namespace tunnel
 	{
 		if (config) 
 			return CreateTunnel<InboundTunnel>(config, outboundTunnel);
-    else 
+		else
 			return CreateZeroHopsInboundTunnel ();
 	}
 
diff --git a/Tunnel.h b/Tunnel.h
index 5b596886..115adf00 100644
--- a/Tunnel.h
+++ b/Tunnel.h
@@ -89,7 +89,7 @@ namespace tunnel
 			std::vector<std::shared_ptr<const i2p::data::IdentityEx> > GetPeers () const; 
 			std::vector<std::shared_ptr<const i2p::data::IdentityEx> > GetInvertedPeers () const; 
 			TunnelState GetState () const { return m_State; };
-      void SetState (TunnelState state);
+			void SetState (TunnelState state);
 			bool IsEstablished () const { return m_State == eTunnelStateEstablished; };
 			bool IsFailed () const { return m_State == eTunnelStateFailed; };
 			bool IsRecreated () const { return m_IsRecreated; };
diff --git a/TunnelPool.cpp b/TunnelPool.cpp
index da38c1cf..592610c2 100644
--- a/TunnelPool.cpp
+++ b/TunnelPool.cpp
@@ -7,6 +7,7 @@
 #include "Garlic.h"
 #include "Transports.h"
 #include "Log.h"
+#include "Tunnel.h"
 #include "TunnelPool.h"
 #include "Destination.h"
 #include "Event.h"
@@ -70,7 +71,7 @@ namespace tunnel
 	{
 		if (!m_IsActive) return;
 		{
-      EmitTunnelEvent("tunnels.created", createdTunnel);
+			EmitTunnelEvent("tunnels.created", createdTunnel);
 			std::unique_lock<std::mutex> l(m_InboundTunnelsMutex);
 			m_InboundTunnels.insert (createdTunnel);
 		}
@@ -82,8 +83,7 @@ namespace tunnel
 	{
 		if (expiredTunnel)
 		{
-      EmitTunnelEvent("tunnels.expired", expiredTunnel);
-      
+			EmitTunnelEvent("tunnels.expired", expiredTunnel);
 			expiredTunnel->SetTunnelPool (nullptr);
 			for (auto& it: m_Tests)
 				if (it.second.second == expiredTunnel) it.second.second = nullptr;
@@ -97,7 +97,7 @@ namespace tunnel
 	{
 		if (!m_IsActive) return;
 		{
-      EmitTunnelEvent("tunnels.created", createdTunnel);
+			EmitTunnelEvent("tunnels.created", createdTunnel);
 			std::unique_lock<std::mutex> l(m_OutboundTunnelsMutex);
 			m_OutboundTunnels.insert (createdTunnel);
 		}
@@ -108,8 +108,7 @@ namespace tunnel
 	{
 		if (expiredTunnel)
 		{
-      EmitTunnelEvent("tunnels.expired", expiredTunnel);
-      
+			EmitTunnelEvent("tunnels.expired", expiredTunnel);
 			expiredTunnel->SetTunnelPool (nullptr);
 			for (auto& it: m_Tests)
 				if (it.second.first == expiredTunnel) it.second.first = nullptr;
diff --git a/Websocket.cpp b/Websocket.cpp
index b51c6da1..0de44efe 100644
--- a/Websocket.cpp
+++ b/Websocket.cpp
@@ -15,123 +15,123 @@
 
 namespace i2p
 {
-  namespace event
-  {
+	namespace event
+	{
 
-    typedef websocketpp::server<websocketpp::config::asio> ServerImpl;
-    typedef websocketpp::connection_hdl ServerConn;
-    
-    class WebsocketServerImpl : public EventListener
-    {
-    private:
-      typedef ServerImpl::message_ptr MessagePtr;
-    public:
+		typedef websocketpp::server<websocketpp::config::asio> ServerImpl;
+		typedef websocketpp::connection_hdl ServerConn;
+		
+		class WebsocketServerImpl : public EventListener
+		{
+		private:
+			typedef ServerImpl::message_ptr MessagePtr;
+		public:
 
-      WebsocketServerImpl(const std::string & addr, int port) : m_run(false), m_thread(nullptr)
-      {
-        m_server.init_asio();
-        m_server.set_open_handler(std::bind(&WebsocketServerImpl::ConnOpened, this, std::placeholders::_1));
-        m_server.set_close_handler(std::bind(&WebsocketServerImpl::ConnClosed, this, std::placeholders::_1));
-        m_server.set_message_handler(std::bind(&WebsocketServerImpl::OnConnMessage, this, std::placeholders::_1, std::placeholders::_2));
-        
-        m_server.listen(boost::asio::ip::address::from_string(addr), port);
-      }
+			WebsocketServerImpl(const std::string & addr, int port) : m_run(false), m_thread(nullptr)
+			{
+				m_server.init_asio();
+				m_server.set_open_handler(std::bind(&WebsocketServerImpl::ConnOpened, this, std::placeholders::_1));
+				m_server.set_close_handler(std::bind(&WebsocketServerImpl::ConnClosed, this, std::placeholders::_1));
+				m_server.set_message_handler(std::bind(&WebsocketServerImpl::OnConnMessage, this, std::placeholders::_1, std::placeholders::_2));
+				
+				m_server.listen(boost::asio::ip::address::from_string(addr), port);
+			}
 
-      ~WebsocketServerImpl()
-      {
-      }
-      
-      void Start() {
-        m_run = true;
-        m_server.start_accept();
-        m_thread = new std::thread([&] () {
-            while(m_run) {
-              try { 
-                m_server.run();
-              } catch (std::exception & e ) {
-                LogPrint(eLogError, "Websocket server: ", e.what());
-              }
-            }
-          });
-      }
+			~WebsocketServerImpl()
+			{
+			}
+			
+			void Start() {
+				m_run = true;
+				m_server.start_accept();
+				m_thread = new std::thread([&] () {
+						while(m_run) {
+							try { 
+								m_server.run();
+							} catch (std::exception & e ) {
+								LogPrint(eLogError, "Websocket server: ", e.what());
+							}
+						}
+					});
+			}
 
-      void Stop() {
-        m_run = false;
-        m_server.stop();
-        if(m_thread) {
-          m_thread->join();
-          delete m_thread;
-        }
-        m_thread = nullptr;
-      }
+			void Stop() {
+				m_run = false;
+				m_server.stop();
+				if(m_thread) {
+					m_thread->join();
+					delete m_thread;
+				}
+				m_thread = nullptr;
+			}
 
-      void ConnOpened(ServerConn c)
-      {
-        std::lock_guard<std::mutex> lock(m_connsMutex);
-        m_conns.insert(c);
-      }
-      
-      void ConnClosed(ServerConn c)
-      {
-        std::lock_guard<std::mutex> lock(m_connsMutex);
-        m_conns.erase(c);
-      }
+			void ConnOpened(ServerConn c)
+			{
+				std::lock_guard<std::mutex> lock(m_connsMutex);
+				m_conns.insert(c);
+			}
+			
+			void ConnClosed(ServerConn c)
+			{
+				std::lock_guard<std::mutex> lock(m_connsMutex);
+				m_conns.erase(c);
+			}
 
-      void OnConnMessage(ServerConn conn, ServerImpl::message_ptr msg)
-      {
-        (void) conn;
-        (void) msg;
-      }
-      
-      void HandleEvent(const EventType & ev)
-      {
-        std::lock_guard<std::mutex> lock(m_connsMutex);
-        LogPrint(eLogDebug, "websocket event");
-        boost::property_tree::ptree event;
-        for (const auto & item : ev) {
-          event.put(item.first, item.second);
-        }
-        std::ostringstream ss;
-        write_json(ss, event);
-        std::string s = ss.str();
+			void OnConnMessage(ServerConn conn, ServerImpl::message_ptr msg)
+			{
+				(void) conn;
+				(void) msg;
+			}
+			
+			void HandleEvent(const EventType & ev)
+			{
+				std::lock_guard<std::mutex> lock(m_connsMutex);
+				LogPrint(eLogDebug, "websocket event");
+				boost::property_tree::ptree event;
+				for (const auto & item : ev) {
+					event.put(item.first, item.second);
+				}
+				std::ostringstream ss;
+				write_json(ss, event);
+				std::string s = ss.str();
 
-         ConnList::iterator it;
-         for (it = m_conns.begin(); it != m_conns.end(); ++it) {
-           ServerImpl::connection_ptr con = m_server.get_con_from_hdl(*it);
-           con->send(s);
-         }
-      }
-      
-    private:
-      typedef std::set<ServerConn, std::owner_less<ServerConn> > ConnList;
-      bool m_run;
-      std::thread * m_thread;
-      std::mutex m_connsMutex;
-      ConnList m_conns;
-      ServerImpl m_server;
-    };
+				 ConnList::iterator it;
+				 for (it = m_conns.begin(); it != m_conns.end(); ++it) {
+					 ServerImpl::connection_ptr con = m_server.get_con_from_hdl(*it);
+					 con->send(s);
+				 }
+			}
+			
+		private:
+			typedef std::set<ServerConn, std::owner_less<ServerConn> > ConnList;
+			bool m_run;
+			std::thread * m_thread;
+			std::mutex m_connsMutex;
+			ConnList m_conns;
+			ServerImpl m_server;
+		};
 
 
-    WebsocketServer::WebsocketServer(const std::string & addr, int port) : m_impl(new WebsocketServerImpl(addr, port)) {}
-    WebsocketServer::~WebsocketServer()
-    {
-      delete m_impl;
-    }
+		WebsocketServer::WebsocketServer(const std::string & addr, int port) : m_impl(new WebsocketServerImpl(addr, port)) {}
+		WebsocketServer::~WebsocketServer()
+		{
+			delete m_impl;
+		}
 
-    
-    void WebsocketServer::Start()
-    {
-      m_impl->Start();
-    }
+		
+		void WebsocketServer::Start()
+		{
+			m_impl->Start();
+		}
 
-    void WebsocketServer::Stop()
-    {
-      m_impl->Stop();
-    }
-    
-    EventListener * WebsocketServer::ToListener()
-    {
-      return m_impl;
-    }
-  }
+		void WebsocketServer::Stop()
+		{
+			m_impl->Stop();
+		}
+		
+		EventListener * WebsocketServer::ToListener()
+		{
+			return m_impl;
+		}
+	}
 }
diff --git a/Websocket.h b/Websocket.h
index 0e14dfc1..2ddca38f 100644
--- a/Websocket.h
+++ b/Websocket.h
@@ -1,30 +1,28 @@
 #ifndef WEBSOCKET_H__
 #define WEBSOCKET_H__
 #include "Event.h"
-
-
 namespace i2p
 {
-  namespace event
-  {
+	namespace event
+	{
 
-    class WebsocketServerImpl;
-    
-    class WebsocketServer
-    {
-    public:
-      WebsocketServer(const std::string & addr, int port);
-      ~WebsocketServer();
+		class WebsocketServerImpl;
+		
+		class WebsocketServer
+		{
+		public:
+			WebsocketServer(const std::string & addr, int port);
+			~WebsocketServer();
 
-      void Start();
-      void Stop();
+			void Start();
+			void Stop();
 
-      EventListener * ToListener();
-      
-    private:
-      WebsocketServerImpl * m_impl;
-    };
+			EventListener * ToListener();
+			
+		private:
+			WebsocketServerImpl * m_impl;
+		};
 
-  }
+	}
 }
 #endif