diff --git a/MysqliDb.php b/MysqliDb.php
index 6f1e957..27e1a1e 100644
--- a/MysqliDb.php
+++ b/MysqliDb.php
@@ -252,6 +252,8 @@ class MysqliDb
      */
     protected $_transaction_in_progress = false;
 
+    protected $timezone;
+
     /**
      * @param string $host
      * @param string $username
@@ -261,7 +263,7 @@ class MysqliDb
      * @param string $charset
      * @param string $socket
      */
-    public function __construct($host = null, $username = null, $password = null, $db = null, $port = null, $charset = 'utf8', $socket = null)
+    public function __construct($host = null, $username = null, $password = null, $db = null, $port = null, $charset = 'utf8', $timezone = null, $socket = null)
     {
         $isSubQuery = false;
 
@@ -291,6 +293,10 @@ public function __construct($host = null, $username = null, $password = null, $d
             $this->setPrefix($prefix);
         }
 
+        if (isset($timezone)) {
+            $this->timezone = $timezone;
+        }
+
         self::$_instance = $this;
     }
 
@@ -329,6 +335,11 @@ public function connect($connectionName = 'default')
         if (!empty($charset)) {
             $mysqli->set_charset($charset);
         }
+
+        if ($this->timezone) {
+            $mysqli->query("SET time_zone = '" . $this->timezone . "'");
+        }
+
         $this->_mysqli[$connectionName] = $mysqli;
     }
 
@@ -551,7 +562,7 @@ private function queryUnprepared($query)
      * @return string Contains the returned rows from the query.
      */
     public function rawAddPrefix($query){
-        $query = str_replace(PHP_EOL, null, $query);
+        $query = str_replace(PHP_EOL, ' ', $query);
         $query = preg_replace('/\s+/', ' ', $query);
         preg_match_all("/(from|into|update|join) [\\'\\´]?([a-zA-Z0-9_-]+)[\\'\\´]?/i", $query, $matches);
         list($from_table, $from, $table) = $matches;
diff --git a/readme.md b/readme.md
index cf88b40..3468af4 100644
--- a/readme.md
+++ b/readme.md
@@ -63,7 +63,8 @@ $db = new MysqliDb (Array (
                 'db'=> 'databaseName',
                 'port' => 3306,
                 'prefix' => 'my_',
-                'charset' => 'utf8'));
+                'charset' => 'utf8',
+                'timezone' => '-5:00'));
 ```
 table prefix, port and database charset params are optional.
 If no charset should be set charset, set it to null