diff --git a/LeLogger.php b/LeLogger.php
index bfc3adf..8895240 100644
--- a/LeLogger.php
+++ b/LeLogger.php
@@ -32,11 +32,9 @@ class LeLogger
 	 */
 
 	// Logentries server address for receiving logs
-	const LE_ADDRESS = 'tcp://api.logentries.com';
+	const LE_ADDRESS = 'tcp://data.logentries.com';
 	// Logentries server address for receiving logs via TLS
 	const LE_TLS_ADDRESS = 'tls://api.logentries.com';
-	// Logentries server port for receiving logs by token
-	const LE_PORT = 10000;
 	// Logentries server port for receiving logs with TLS by token
 	const LE_TLS_PORT = 20000;
 
@@ -46,7 +44,8 @@ class LeLogger
 	
 	private $_datahubIPAddress = "";
 	private $use_datahub = false;
-	private $_datahubPort = 10000;
+
+	private $port = false;
 
 	private $use_host_name = false;
 	private $_host_name = "";
@@ -69,11 +68,11 @@ class LeLogger
 	
 	private $errstr;
 
-	public static function getLogger($token, $persistent, $ssl, $severity, $datahubEnabled, $datahubIPAddress, $datahubPort, $host_id, $host_name, $host_name_enabled, $add_local_timestamp)
+	public static function getLogger($token, $persistent, $ssl, $severity, $datahubEnabled, $datahubIPAddress, $connectionTimeout, $port, $host_id, $host_name, $host_name_enabled, $add_local_timestamp)
 	{
 		if ( ! isset(self::$m_instance[$token]))
 		{
-			self::$m_instance[$token] = new LeLogger($token, $persistent, $ssl, $severity, $datahubEnabled, $datahubIPAddress, $datahubPort, $host_id, $host_name, $host_name_enabled, $add_local_timestamp);
+			self::$m_instance[$token] = new LeLogger($token, $persistent, $ssl, $severity, $datahubEnabled, $datahubIPAddress, $connectionTimeout, $port, $host_id, $host_name, $host_name_enabled, $add_local_timestamp);
 		}
 
 		return self::$m_instance[$token];
@@ -87,7 +86,7 @@ public static function tearDown()
 		self::$m_instance = array();
 	}
 
-	private function __construct($token, $persistent, $ssl, $severity, $datahubEnabled, $datahubIPAddress, $datahubPort, $host_id, $host_name, $host_name_enabled, $add_local_timestamp)
+	private function __construct($token, $persistent, $ssl, $severity, $datahubEnabled, $datahubIPAddress, $connectionTimeout, $port, $host_id, $host_name, $host_name_enabled, $add_local_timestamp)
 	{
 
 		if ($datahubEnabled===true)
@@ -99,7 +98,6 @@ private function __construct($token, $persistent, $ssl, $severity, $datahubEnabl
 			// set Datahub variable values			
 			$this->_datahubIPAddress = $datahubIPAddress;
 			$this->use_datahub = $datahubEnabled;
-			$this->_datahubPort = $datahubPort;	
 		
 		
 			// if datahub is being used the logToken should be set to null
@@ -156,7 +154,9 @@ private function __construct($token, $persistent, $ssl, $severity, $datahubEnabl
 
 		$this->severity = $severity;
 
-		$this->connectionTimeout = (float) ini_get('default_socket_timeout');
+		$this->connectionTimeout = $connectionTimeout;
+
+		$this->port = $port;
 	}
 
 
@@ -210,14 +210,11 @@ public function getPort()
 		{
 			return self::LE_TLS_PORT;
 		}
-		elseif ($this->isDatahub() )
-		{
-		 	return $this->_datahubPort;
-		}
 		else
 		{
-			return self::LE_PORT;
+			return $this->port;
 		}
+
 	}
 	
 	
diff --git a/unit_tests/LeLoggerTests.php b/unit_tests/LeLoggerTests.php
index b312864..fd0da9c 100644
--- a/unit_tests/LeLoggerTests.php
+++ b/unit_tests/LeLoggerTests.php
@@ -82,7 +82,7 @@ public function testGetPort()
 
 			$this->tearDown();
 
-			$log = LeLogger::getLogger('token', true, true, LOG_DEBUG, false, "", 10000, "", "", false, true);
+			$log = LeLogger::getLogger('token', true, true, LOG_DEBUG, false, "", 0, "", "", false, true);
 
 			$this->assertEquals(20000, $log->getPort());
 		}
@@ -91,7 +91,7 @@ public function testGetAddress()
 		{
 			$log = LeLogger::getLogger('token', true, false, LOG_DEBUG, false, "", 10000, "", "", false, true);
 
-			$this->assertEquals('tcp://api.logentries.com', $log->getAddress());
+			$this->assertEquals('tcp://data.logentries.com', $log->getAddress());
 
 			$this->tearDown();
 			$log = LeLogger::getLogger('token', true, true, LOG_DEBUG, false, "", 10000, "", "", false, true);