diff --git a/YSF2DMR/Conf.cpp b/YSF2DMR/Conf.cpp
index fbbfbbc..e41d7f7 100644
--- a/YSF2DMR/Conf.cpp
+++ b/YSF2DMR/Conf.cpp
@@ -47,6 +47,7 @@ m_dstPort(0U),
 m_localAddress(),
 m_localPort(0U),
 m_enableWiresX(false),
+m_remoteGateway(false),
 m_daemon(false),
 m_rxFrequency(0U),
 m_txFrequency(0U),
@@ -71,6 +72,7 @@ m_dmrNetworkOptions(),
 m_dmrNetworkDebug(false),
 m_dmrNetworkJitterEnabled(true),
 m_dmrNetworkJitter(500U),
+m_dmrHangTime(1000U),
 m_dmrNetworkEnableUnlink(true),
 m_dmrNetworkIDUnlink(4000U),
 m_dmrNetworkPCUnlink(false),
@@ -164,6 +166,8 @@ bool CConf::read()
 			m_localPort = (unsigned int)::atoi(value);
 		else if (::strcmp(key, "EnableWiresX") == 0)
 			m_enableWiresX = ::atoi(value) == 1;
+		else if (::strcmp(key, "RemoteGateway") == 0)
+			m_remoteGateway = ::atoi(value) == 1;
 		else if (::strcmp(key, "Daemon") == 0)
 			m_daemon = ::atoi(value) == 1;
 	} else if (section == SECTION_INFO) {
@@ -217,6 +221,8 @@ bool CConf::read()
 			m_dmrNetworkJitterEnabled = ::atoi(value) == 1;
 		else if (::strcmp(key, "Jitter") == 0)
 			m_dmrNetworkJitter = (unsigned int)::atoi(value);
+		else if (::strcmp(key, "HangTime") == 0)
+			m_dmrHangTime = (unsigned int)::atoi(value);
 		else if (::strcmp(key, "EnableUnlink") == 0)
 			m_dmrNetworkEnableUnlink = ::atoi(value) == 1;
 		else if (::strcmp(key, "TGUnlink") == 0)
@@ -297,6 +303,11 @@ bool CConf::getEnableWiresX() const
 	return m_enableWiresX;
 }
 
+bool CConf::getRemoteGateway() const
+{
+	return m_remoteGateway;
+}
+
 bool CConf::getDaemon() const
 {
 	return m_daemon;
@@ -452,6 +463,11 @@ unsigned int CConf::getDMRNetworkJitter() const
 	return m_dmrNetworkJitter;
 }
 
+unsigned int CConf::getDMRHangTime() const
+{
+	return m_dmrHangTime;
+}
+
 bool CConf::getDMRNetworkEnableUnlink() const
 {
 	return m_dmrNetworkEnableUnlink;
diff --git a/YSF2DMR/Conf.h b/YSF2DMR/Conf.h
index 5b07838..032f85f 100644
--- a/YSF2DMR/Conf.h
+++ b/YSF2DMR/Conf.h
@@ -40,6 +40,7 @@ public:
   std::string  getLocalAddress() const;
   unsigned int getLocalPort() const;
   bool         getEnableWiresX() const;
+  bool         getRemoteGateway() const;
   bool         getDaemon() const;
 
   // The Info section
@@ -68,6 +69,7 @@ public:
   bool         getDMRNetworkDebug() const;
   bool         getDMRNetworkJitterEnabled() const;
   unsigned int getDMRNetworkJitter() const;
+  unsigned int getDMRHangTime() const;
   bool         getDMRNetworkEnableUnlink() const;
   unsigned int getDMRNetworkIDUnlink() const;
   bool         getDMRNetworkPCUnlink() const;
@@ -101,6 +103,7 @@ private:
   std::string  m_localAddress;
   unsigned int m_localPort;
   bool         m_enableWiresX;
+  bool         m_remoteGateway;
   bool         m_daemon;
 
   unsigned int m_rxFrequency;
@@ -127,6 +130,7 @@ private:
   bool         m_dmrNetworkDebug;
   bool         m_dmrNetworkJitterEnabled;
   unsigned int m_dmrNetworkJitter;
+  unsigned int m_dmrHangTime;
   bool         m_dmrNetworkEnableUnlink;
   unsigned int m_dmrNetworkIDUnlink;
   bool         m_dmrNetworkPCUnlink;
diff --git a/YSF2DMR/YSF2DMR.ini b/YSF2DMR/YSF2DMR.ini
index 7fec109..3004475 100644
--- a/YSF2DMR/YSF2DMR.ini
+++ b/YSF2DMR/YSF2DMR.ini
@@ -18,6 +18,7 @@ DstPort=42000
 LocalAddress=127.0.0.1
 LocalPort=42013
 EnableWiresX=1
+RemoteGateway=0
 Daemon=0
 
 [DMR Network]
@@ -31,6 +32,7 @@ StartupPC=1
 Address=44.131.4.1
 Port=62031
 Jitter=500
+HangTime=1000
 EnableUnlink=1
 TGUnlink=4000
 PCUnlink=0