diff --git a/Classes/PHPExcel/CachedObjectStorage/APC.php b/Classes/PHPExcel/CachedObjectStorage/APC.php
index e25f3f0..b15a42e 100644
--- a/Classes/PHPExcel/CachedObjectStorage/APC.php
+++ b/Classes/PHPExcel/CachedObjectStorage/APC.php
@@ -67,8 +67,8 @@ class CachedObjectStorage_APC extends CachedObjectStorage_CacheBase implements C
             if (!apc_store(
                 $this->cachePrefix.$this->currentObjectID.'.cache',
                 serialize($this->currentObject),
-                $this->cacheTime)
-            ) {
+                $this->cacheTime
+            )) {
                 $this->__destruct();
                 throw new Exception('Failed to store cell '.$this->currentObjectID.' in APC');
             }
@@ -268,7 +268,7 @@ class CachedObjectStorage_APC extends CachedObjectStorage_CacheBase implements C
     public function __destruct()
     {
         $cacheList = $this->getCellList();
-        foreach($cacheList as $cellID) {
+        foreach ($cacheList as $cellID) {
             apc_delete($this->cachePrefix.$cellID.'.cache');
         }
     }
diff --git a/Classes/PHPExcel/CachedObjectStorage/CacheBase.php b/Classes/PHPExcel/CachedObjectStorage/CacheBase.php
index b18b512..24b7b88 100644
--- a/Classes/PHPExcel/CachedObjectStorage/CacheBase.php
+++ b/Classes/PHPExcel/CachedObjectStorage/CacheBase.php
@@ -1,318 +1,318 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2013 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-namespace PHPExcel;
- 
-/**
- * PHPExcel\CachedObjectStorage_CacheBase
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-abstract class CachedObjectStorage_CacheBase
-{
-    /**
-     * Parent worksheet
-     *
-     * @var PHPExcel\Worksheet
-     */
-    protected $parent;
-
-    /**
-     * The currently active Cell
-     *
-     * @var PHPExcel\Cell
-     */
-    protected $currentObject = null;
-
-    /**
-     * Coordinate address of the currently active Cell
-     *
-     * @var string
-     */
-    protected $currentObjectID = null;
-
-    /**
-     * Flag indicating whether the currently active Cell requires saving
-     *
-     * @var boolean
-     */
-    protected $currentCellIsDirty = true;
-
-    /**
-     * An array of cells or cell pointers for the worksheet cells held in this cache,
-     *        and indexed by their coordinate address within the worksheet
-     *
-     * @var array of mixed
-     */
-    protected $cellCache = array();
-
-
-    /**
-     * Initialise this new cell collection
-     *
-     * @param    PHPExcel\Worksheet    $parent        The worksheet for this cell collection
-     */
-    public function __construct(Worksheet $parent)
-    {
-        //    Set our parent worksheet.
-        //    This is maintained within the cache controller to facilitate re-attaching it to PHPExcel\Cell objects when
-        //        they are woken from a serialized state
-        $this->parent = $parent;
-    }
-
-    /**
-     * Return the parent worksheet for this cell collection
-     *
-     * @return    PHPExcel\Worksheet
-     */
-    public function getParent()
-    {
-        return $this->parent;
-    }
-
-    /**
-     * Is a value set in the current PHPExcel\CachedObjectStorage_ICache for an indexed cell?
-     *
-     * @param    string        $pCoord        Coordinate address of the cell to check
-     * @return    boolean
-     */
-    public function isDataSet($pCoord)
-    {
-        if ($pCoord === $this->currentObjectID) {
-            return true;
-        }
-        //    Check if the requested entry exists in the cache
-        return isset($this->cellCache[$pCoord]);
-    }
-
-    /**
-     * Move a cell object from one address to another
-     *
-     * @param    string        $fromAddress    Current address of the cell to move
-     * @param    string        $toAddress        Destination address of the cell to move
-     * @return    boolean
-     */
-    public function moveCell($fromAddress, $toAddress)
-    {
-        if ($fromAddress === $this->currentObjectID) {
-            $this->currentObjectID = $toAddress;
-        }
-        $this->currentCellIsDirty = true;
-        if (isset($this->cellCache[$fromAddress])) {
-            $this->cellCache[$toAddress] = &$this->cellCache[$fromAddress];
-            unset($this->cellCache[$fromAddress]);
-        }
-
-        return true;
-    }
-
-    /**
-     * Add or Update a cell in cache
-     *
-     * @param    PHPExcel\Cell    $cell        Cell to update
-     * @return    void
-     * @throws    PHPExcel\Exception
-     */
-    public function updateCacheData(Cell $cell)
-    {
-        return $this->addCacheData($cell->getCoordinate(), $cell);
-    }
-
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @param    string            $pCoord        Coordinate address of the cell to delete
-     * @throws    PHPExcel\Exception
-     */
-    public function deleteCacheData($pCoord)
-    {
-        if ($pCoord === $this->currentObjectID) {
-            $this->currentObject->detach();
-            $this->currentObjectID = $this->currentObject = null;
-        }
-
-        if (is_object($this->cellCache[$pCoord])) {
-            $this->cellCache[$pCoord]->detach();
-            unset($this->cellCache[$pCoord]);
-        }
-        $this->currentCellIsDirty = false;
-    }
-
-    /**
-     * Get a list of all cell addresses currently held in cache
-     *
-     * @return    array of string
-     */
-    public function getCellList()
-    {
-        return array_keys($this->cellCache);
-    }
-
-    /**
-     * Sort the list of all cell addresses currently held in cache by row and column
-     *
-     * @return    void
-     */
-    public function getSortedCellList()
-    {
-        $sortKeys = array();
-        foreach ($this->getCellList() as $coord) {
-            sscanf($coord, '%[A-Z]%d', $column, $row);
-            $sortKeys[sprintf('%09d%3s', $row, $column)] = $coord;
-        }
-        ksort($sortKeys);
-
-        return array_values($sortKeys);
-    }
-
-    /**
-     * Get highest worksheet column and highest row that have cell records
-     *
-     * @return array Highest column name and highest row number
-     */
-    public function getHighestRowAndColumn()
-    {
-        // Lookup highest column and highest row
-        $col = array('A' => '1A');
-        $row = array(1);
-        foreach ($this->getCellList() as $coord) {
-            sscanf($coord, '%[A-Z]%d', $c, $r);
-            $row[$r] = $r;
-            $col[$c] = strlen($c).$c;
-        }
-        if (!empty($row)) {
-            // Determine highest column and row
-            $highestRow = max($row);
-            $highestColumn = substr(max($col), 1);
-        }
-
-        return array(
-            'row'    => $highestRow,
-            'column' => $highestColumn
-        );
-    }
-
-    /**
-     * Return the cell address of the currently active cell object
-     *
-     * @return    string
-     */
-    public function getCurrentAddress()
-    {
-        return $this->currentObjectID;
-    }
-
-    /**
-     * Return the column address of the currently active cell object
-     *
-     * @return    string
-     */
-    public function getCurrentColumn()
-    {
-        sscanf($this->currentObjectID, '%[A-Z]%d', $column, $row);
-        return $column;
-    }
-
-    /**
-     * Return the row address of the currently active cell object
-     *
-     * @return    string
-     */
-    public function getCurrentRow()
-    {
-        sscanf($this->currentObjectID, '%[A-Z]%d', $column, $row);
-        return $row;
-    }
-
-    /**
-     * Get highest worksheet column
-     *
-     * @return string Highest column name
-     */
-    public function getHighestColumn()
-    {
-        $colRow = $this->getHighestRowAndColumn();
-        return $colRow['column'];
-    }
-
-    /**
-     * Get highest worksheet row
-     *
-     * @return int Highest row number
-     */
-    public function getHighestRow()
-    {
-        $colRow = $this->getHighestRowAndColumn();
-        return $colRow['row'];
-    }
-
-    /**
-     * Generate a unique ID for cache referencing
-     *
-     * @return string Unique Reference
-     */
-    protected function getUniqueID()
-    {
-        if (function_exists('posix_getpid')) {
-            $baseUnique = posix_getpid();
-        } else {
-            $baseUnique = mt_rand();
-        }
-        return uniqid($baseUnique, true);
-    }
-
-    /**
-     * Clone the cell collection
-     *
-     * @param    PHPExcel\Worksheet    $parent        The new worksheet
-     * @return    void
-     */
-    public function copyCellCollection(Worksheet $parent)
-    {
-        $this->currentCellIsDirty;
-        $this->storeData();
-
-        $this->parent = $parent;
-        if (($this->currentObject !== null) && (is_object($this->currentObject))) {
-            $this->currentObject->attach($this);
-        }
-    }
-
-    /**
-     * Identify whether the caching method is currently available
-     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-     *
-     * @return    boolean
-     */
-    public static function cacheMethodIsAvailable()
-    {
-        return true;
-    }
-}
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2013 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+namespace PHPExcel;
+ 
+/**
+ * PHPExcel\CachedObjectStorage_CacheBase
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+abstract class CachedObjectStorage_CacheBase
+{
+    /**
+     * Parent worksheet
+     *
+     * @var PHPExcel\Worksheet
+     */
+    protected $parent;
+
+    /**
+     * The currently active Cell
+     *
+     * @var PHPExcel\Cell
+     */
+    protected $currentObject = null;
+
+    /**
+     * Coordinate address of the currently active Cell
+     *
+     * @var string
+     */
+    protected $currentObjectID = null;
+
+    /**
+     * Flag indicating whether the currently active Cell requires saving
+     *
+     * @var boolean
+     */
+    protected $currentCellIsDirty = true;
+
+    /**
+     * An array of cells or cell pointers for the worksheet cells held in this cache,
+     *        and indexed by their coordinate address within the worksheet
+     *
+     * @var array of mixed
+     */
+    protected $cellCache = array();
+
+
+    /**
+     * Initialise this new cell collection
+     *
+     * @param    PHPExcel\Worksheet    $parent        The worksheet for this cell collection
+     */
+    public function __construct(Worksheet $parent)
+    {
+        //    Set our parent worksheet.
+        //    This is maintained within the cache controller to facilitate re-attaching it to PHPExcel\Cell objects when
+        //        they are woken from a serialized state
+        $this->parent = $parent;
+    }
+
+    /**
+     * Return the parent worksheet for this cell collection
+     *
+     * @return    PHPExcel\Worksheet
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Is a value set in the current PHPExcel\CachedObjectStorage_ICache for an indexed cell?
+     *
+     * @param    string        $pCoord        Coordinate address of the cell to check
+     * @return    boolean
+     */
+    public function isDataSet($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return true;
+        }
+        //    Check if the requested entry exists in the cache
+        return isset($this->cellCache[$pCoord]);
+    }
+
+    /**
+     * Move a cell object from one address to another
+     *
+     * @param    string        $fromAddress    Current address of the cell to move
+     * @param    string        $toAddress        Destination address of the cell to move
+     * @return    boolean
+     */
+    public function moveCell($fromAddress, $toAddress)
+    {
+        if ($fromAddress === $this->currentObjectID) {
+            $this->currentObjectID = $toAddress;
+        }
+        $this->currentCellIsDirty = true;
+        if (isset($this->cellCache[$fromAddress])) {
+            $this->cellCache[$toAddress] = &$this->cellCache[$fromAddress];
+            unset($this->cellCache[$fromAddress]);
+        }
+
+        return true;
+    }
+
+    /**
+     * Add or Update a cell in cache
+     *
+     * @param    PHPExcel\Cell    $cell        Cell to update
+     * @return    void
+     * @throws    PHPExcel\Exception
+     */
+    public function updateCacheData(Cell $cell)
+    {
+        return $this->addCacheData($cell->getCoordinate(), $cell);
+    }
+
+    /**
+     * Delete a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to delete
+     * @throws    PHPExcel\Exception
+     */
+    public function deleteCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            $this->currentObject->detach();
+            $this->currentObjectID = $this->currentObject = null;
+        }
+
+        if (is_object($this->cellCache[$pCoord])) {
+            $this->cellCache[$pCoord]->detach();
+            unset($this->cellCache[$pCoord]);
+        }
+        $this->currentCellIsDirty = false;
+    }
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return    array of string
+     */
+    public function getCellList()
+    {
+        return array_keys($this->cellCache);
+    }
+
+    /**
+     * Sort the list of all cell addresses currently held in cache by row and column
+     *
+     * @return    void
+     */
+    public function getSortedCellList()
+    {
+        $sortKeys = array();
+        foreach ($this->getCellList() as $coord) {
+            sscanf($coord, '%[A-Z]%d', $column, $row);
+            $sortKeys[sprintf('%09d%3s', $row, $column)] = $coord;
+        }
+        ksort($sortKeys);
+
+        return array_values($sortKeys);
+    }
+
+    /**
+     * Get highest worksheet column and highest row that have cell records
+     *
+     * @return array Highest column name and highest row number
+     */
+    public function getHighestRowAndColumn()
+    {
+        // Lookup highest column and highest row
+        $col = array('A' => '1A');
+        $row = array(1);
+        foreach ($this->getCellList() as $coord) {
+            sscanf($coord, '%[A-Z]%d', $c, $r);
+            $row[$r] = $r;
+            $col[$c] = strlen($c).$c;
+        }
+        if (!empty($row)) {
+            // Determine highest column and row
+            $highestRow = max($row);
+            $highestColumn = substr(max($col), 1);
+        }
+
+        return array(
+            'row'    => $highestRow,
+            'column' => $highestColumn
+        );
+    }
+
+    /**
+     * Return the cell address of the currently active cell object
+     *
+     * @return    string
+     */
+    public function getCurrentAddress()
+    {
+        return $this->currentObjectID;
+    }
+
+    /**
+     * Return the column address of the currently active cell object
+     *
+     * @return    string
+     */
+    public function getCurrentColumn()
+    {
+        sscanf($this->currentObjectID, '%[A-Z]%d', $column, $row);
+        return $column;
+    }
+
+    /**
+     * Return the row address of the currently active cell object
+     *
+     * @return    string
+     */
+    public function getCurrentRow()
+    {
+        sscanf($this->currentObjectID, '%[A-Z]%d', $column, $row);
+        return $row;
+    }
+
+    /**
+     * Get highest worksheet column
+     *
+     * @return string Highest column name
+     */
+    public function getHighestColumn()
+    {
+        $colRow = $this->getHighestRowAndColumn();
+        return $colRow['column'];
+    }
+
+    /**
+     * Get highest worksheet row
+     *
+     * @return int Highest row number
+     */
+    public function getHighestRow()
+    {
+        $colRow = $this->getHighestRowAndColumn();
+        return $colRow['row'];
+    }
+
+    /**
+     * Generate a unique ID for cache referencing
+     *
+     * @return string Unique Reference
+     */
+    protected function getUniqueID()
+    {
+        if (function_exists('posix_getpid')) {
+            $baseUnique = posix_getpid();
+        } else {
+            $baseUnique = mt_rand();
+        }
+        return uniqid($baseUnique, true);
+    }
+
+    /**
+     * Clone the cell collection
+     *
+     * @param    PHPExcel\Worksheet    $parent        The new worksheet
+     * @return    void
+     */
+    public function copyCellCollection(Worksheet $parent)
+    {
+        $this->currentCellIsDirty;
+        $this->storeData();
+
+        $this->parent = $parent;
+        if (($this->currentObject !== null) && (is_object($this->currentObject))) {
+            $this->currentObject->attach($this);
+        }
+    }
+
+    /**
+     * Identify whether the caching method is currently available
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+     *
+     * @return    boolean
+     */
+    public static function cacheMethodIsAvailable()
+    {
+        return true;
+    }
+}
diff --git a/Classes/PHPExcel/CachedObjectStorage/DiscISAM.php b/Classes/PHPExcel/CachedObjectStorage/DiscISAM.php
index 80bd204..5f17446 100644
--- a/Classes/PHPExcel/CachedObjectStorage/DiscISAM.php
+++ b/Classes/PHPExcel/CachedObjectStorage/DiscISAM.php
@@ -1,222 +1,222 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2013 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-namespace PHPExcel;
- 
-/**
- * PHPExcel\CachedObjectStorage_DiscISAM
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class CachedObjectStorage_DiscISAM extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
-{
-    /**
-     * Name of the file for this cache
-     *
-     * @var string
-     */
-    private $fileName = null;
-
-    /**
-     * File handle for this cache file
-     *
-     * @var resource
-     */
-    private $fileHandle = null;
-
-    /**
-     * Directory/Folder where the cache file is located
-     *
-     * @var string
-     */
-    private $cacheDirectory = null;
-
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-     * @return    void
-     * @throws    PHPExcel\Exception
-     */
-    protected function storeData()
-    {
-        if ($this->currentCellIsDirty) {
-            $this->currentObject->detach();
-
-            fseek($this->fileHandle, 0, SEEK_END);
-            $offset = ftell($this->fileHandle);
-            fwrite($this->fileHandle, serialize($this->currentObject));
-            $this->cellCache[$this->currentObjectID] = array(
-                'ptr' => $offset,
-                'sz'  => ftell($this->fileHandle) - $offset
-            );
-            $this->currentCellIsDirty = false;
-        }
-        $this->currentObjectID = $this->currentObject = null;
-    }
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param    string            $pCoord        Coordinate address of the cell to update
-     * @param    PHPExcel\Cell    $cell        Cell to update
-     * @return    void
-     * @throws    PHPExcel\Exception
-     */
-    public function addCacheData($pCoord, Cell $cell)
-    {
-        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
-            $this->storeData();
-        }
-
-        $this->currentObjectID = $pCoord;
-        $this->currentObject = $cell;
-        $this->currentCellIsDirty = true;
-
-        return $cell;
-    }
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param     string             $pCoord        Coordinate of the cell
-     * @throws     PHPExcel\Exception
-     * @return     PHPExcel\Cell     Cell that was found, or null if not found
-     */
-    public function getCacheData($pCoord)
-    {
-        if ($pCoord === $this->currentObjectID) {
-            return $this->currentObject;
-        }
-        $this->storeData();
-
-        //    Check if the entry that has been requested actually exists
-        if (!isset($this->cellCache[$pCoord])) {
-            //    Return null if requested entry doesn't exist in cache
-            return null;
-        }
-
-        //    Set current entry to the requested entry
-        $this->currentObjectID = $pCoord;
-        fseek($this->fileHandle, $this->cellCache[$pCoord]['ptr']);
-        $this->currentObject = unserialize(fread($this->fileHandle, $this->cellCache[$pCoord]['sz']));
-        //    Re-attach this as the cell's parent
-        $this->currentObject->attach($this);
-
-        //    Return requested entry
-        return $this->currentObject;
-    }
-
-    /**
-     * Get a list of all cell addresses currently held in cache
-     *
-     * @return  array of string
-     */
-    public function getCellList()
-    {
-        if ($this->currentObjectID !== null) {
-            $this->storeData();
-        }
-
-        return parent::getCellList();
-    }
-
-    /**
-     * Clone the cell collection
-     *
-     * @param    PHPExcel\Worksheet    $parent        The new worksheet
-     * @return    void
-     */
-    public function copyCellCollection(Worksheet $parent)
-    {
-        parent::copyCellCollection($parent);
-        //    Get a new id for the new file name
-        $baseUnique = $this->getUniqueID();
-        $newFileName = $this->cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
-        //    Copy the existing cell cache file
-        copy ($this->fileName, $newFileName);
-        $this->fileName = $newFileName;
-        //    Open the copied cell cache file
-        $this->fileHandle = fopen($this->fileName, 'a+');
-    }
-
-    /**
-     * Clear the cell collection and disconnect from our parent
-     *
-     * @return    void
-     */
-    public function unsetWorksheetCells()
-    {
-        if (!is_null($this->currentObject)) {
-            $this->currentObject->detach();
-            $this->currentObject = $this->currentObjectID = null;
-        }
-        $this->cellCache = array();
-
-        //    detach ourself from the worksheet, so that it can then delete this object successfully
-        $this->parent = null;
-
-        //    Close down the temporary cache file
-        $this->__destruct();
-    }
-
-    /**
-     * Initialise this new cell collection
-     *
-     * @param    PHPExcel\Worksheet    $parent        The worksheet for this cell collection
-     * @param    array of mixed        $arguments    Additional initialisation arguments
-     */
-    public function __construct(Worksheet $parent, $arguments)
-    {
-        $this->cacheDirectory = ((isset($arguments['dir'])) && ($arguments['dir'] !== null))
-                                 ? $arguments['dir']
-                                 : Shared_File::sys_get_temp_dir();
-
-        parent::__construct($parent);
-        if (is_null($this->fileHandle)) {
-            $baseUnique = $this->getUniqueID();
-            $this->fileName = $this->cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
-            $this->fileHandle = fopen($this->fileName, 'a+');
-        }
-    }
-
-    /**
-     * Destroy this cell collection
-     */
-    public function __destruct()
-    {
-        if (!is_null($this->fileHandle)) {
-            fclose($this->fileHandle);
-            unlink($this->fileName);
-        }
-        $this->fileHandle = null;
-    }
-}
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2013 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+namespace PHPExcel;
+ 
+/**
+ * PHPExcel\CachedObjectStorage_DiscISAM
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class CachedObjectStorage_DiscISAM extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
+{
+    /**
+     * Name of the file for this cache
+     *
+     * @var string
+     */
+    private $fileName = null;
+
+    /**
+     * File handle for this cache file
+     *
+     * @var resource
+     */
+    private $fileHandle = null;
+
+    /**
+     * Directory/Folder where the cache file is located
+     *
+     * @var string
+     */
+    private $cacheDirectory = null;
+
+
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+     * @return    void
+     * @throws    PHPExcel\Exception
+     */
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty) {
+            $this->currentObject->detach();
+
+            fseek($this->fileHandle, 0, SEEK_END);
+            $offset = ftell($this->fileHandle);
+            fwrite($this->fileHandle, serialize($this->currentObject));
+            $this->cellCache[$this->currentObjectID] = array(
+                'ptr' => $offset,
+                'sz'  => ftell($this->fileHandle) - $offset
+            );
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
+    }
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel\Cell    $cell        Cell to update
+     * @return    void
+     * @throws    PHPExcel\Exception
+     */
+    public function addCacheData($pCoord, Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param     string             $pCoord        Coordinate of the cell
+     * @throws     PHPExcel\Exception
+     * @return     PHPExcel\Cell     Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
+        }
+        $this->storeData();
+
+        //    Check if the entry that has been requested actually exists
+        if (!isset($this->cellCache[$pCoord])) {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+        fseek($this->fileHandle, $this->cellCache[$pCoord]['ptr']);
+        $this->currentObject = unserialize(fread($this->fileHandle, $this->cellCache[$pCoord]['sz']));
+        //    Re-attach this as the cell's parent
+        $this->currentObject->attach($this);
+
+        //    Return requested entry
+        return $this->currentObject;
+    }
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  array of string
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
+
+        return parent::getCellList();
+    }
+
+    /**
+     * Clone the cell collection
+     *
+     * @param    PHPExcel\Worksheet    $parent        The new worksheet
+     * @return    void
+     */
+    public function copyCellCollection(Worksheet $parent)
+    {
+        parent::copyCellCollection($parent);
+        //    Get a new id for the new file name
+        $baseUnique = $this->getUniqueID();
+        $newFileName = $this->cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
+        //    Copy the existing cell cache file
+        copy($this->fileName, $newFileName);
+        $this->fileName = $newFileName;
+        //    Open the copied cell cache file
+        $this->fileHandle = fopen($this->fileName, 'a+');
+    }
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     * @return    void
+     */
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+        $this->cellCache = array();
+
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+
+        //    Close down the temporary cache file
+        $this->__destruct();
+    }
+
+    /**
+     * Initialise this new cell collection
+     *
+     * @param    PHPExcel\Worksheet    $parent        The worksheet for this cell collection
+     * @param    array of mixed        $arguments    Additional initialisation arguments
+     */
+    public function __construct(Worksheet $parent, $arguments)
+    {
+        $this->cacheDirectory = ((isset($arguments['dir'])) && ($arguments['dir'] !== null))
+                                 ? $arguments['dir']
+                                 : Shared_File::sys_get_temp_dir();
+
+        parent::__construct($parent);
+        if (is_null($this->fileHandle)) {
+            $baseUnique = $this->getUniqueID();
+            $this->fileName = $this->cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
+            $this->fileHandle = fopen($this->fileName, 'a+');
+        }
+    }
+
+    /**
+     * Destroy this cell collection
+     */
+    public function __destruct()
+    {
+        if (!is_null($this->fileHandle)) {
+            fclose($this->fileHandle);
+            unlink($this->fileName);
+        }
+        $this->fileHandle = null;
+    }
+}
diff --git a/Classes/PHPExcel/CachedObjectStorage/Igbinary.php b/Classes/PHPExcel/CachedObjectStorage/Igbinary.php
index bd61415..570ad5d 100644
--- a/Classes/PHPExcel/CachedObjectStorage/Igbinary.php
+++ b/Classes/PHPExcel/CachedObjectStorage/Igbinary.php
@@ -1,150 +1,150 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2013 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-namespace PHPExcel;
-
-/**
- * PHPExcel\CachedObjectStorage_Igbinary
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class CachedObjectStorage_Igbinary extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
-{
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-     * @return    void
-     * @throws    PHPExcel\Exception
-     */
-    protected function storeData()
-    {
-        if ($this->currentCellIsDirty) {
-            $this->currentObject->detach();
-
-            $this->cellCache[$this->currentObjectID] = igbinary_serialize($this->currentObject);
-            $this->currentCellIsDirty = false;
-        }
-        $this->currentObjectID = $this->currentObject = null;
-    }
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param    string            $pCoord        Coordinate address of the cell to update
-     * @param    PHPExcel\Cell    $cell        Cell to update
-     * @return    void
-     * @throws    PHPExcel\Exception
-     */
-    public function addCacheData($pCoord, Cell $cell)
-    {
-        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
-            $this->storeData();
-        }
-
-        $this->currentObjectID = $pCoord;
-        $this->currentObject = $cell;
-        $this->currentCellIsDirty = true;
-
-        return $cell;
-    }
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param     string             $pCoord        Coordinate of the cell
-     * @throws     PHPExcel\Exception
-     * @return     PHPExcel\Cell     Cell that was found, or null if not found
-     */
-    public function getCacheData($pCoord)
-    {
-        if ($pCoord === $this->currentObjectID) {
-            return $this->currentObject;
-        }
-        $this->storeData();
-
-        //    Check if the entry that has been requested actually exists
-        if (!isset($this->cellCache[$pCoord])) {
-            //    Return null if requested entry doesn't exist in cache
-            return null;
-        }
-
-        //    Set current entry to the requested entry
-        $this->currentObjectID = $pCoord;
-        $this->currentObject = igbinary_unserialize($this->cellCache[$pCoord]);
-        //    Re-attach this as the cell's parent
-        $this->currentObject->attach($this);
-
-        //    Return requested entry
-        return $this->currentObject;
-    }
-
-    /**
-     * Get a list of all cell addresses currently held in cache
-     *
-     * @return  array of string
-     */
-    public function getCellList()
-    {
-        if ($this->currentObjectID !== null) {
-            $this->storeData();
-        }
-
-        return parent::getCellList();
-    }
-
-    /**
-     * Clear the cell collection and disconnect from our parent
-     *
-     * @return    void
-     */
-    public function unsetWorksheetCells()
-    {
-        if (!is_null($this->currentObject)) {
-            $this->currentObject->detach();
-            $this->currentObject = $this->currentObjectID = null;
-        }
-        $this->cellCache = array();
-
-        //    detach ourself from the worksheet, so that it can then delete this object successfully
-        $this->parent = null;
-    }
-
-    /**
-     * Identify whether the caching method is currently available
-     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-     *
-     * @return    boolean
-     */
-    public static function cacheMethodIsAvailable()
-    {
-        return function_exists('igbinary_serialize');
-    }
-}
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2013 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+namespace PHPExcel;
+
+/**
+ * PHPExcel\CachedObjectStorage_Igbinary
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class CachedObjectStorage_Igbinary extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
+{
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+     * @return    void
+     * @throws    PHPExcel\Exception
+     */
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty) {
+            $this->currentObject->detach();
+
+            $this->cellCache[$this->currentObjectID] = igbinary_serialize($this->currentObject);
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
+    }
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel\Cell    $cell        Cell to update
+     * @return    void
+     * @throws    PHPExcel\Exception
+     */
+    public function addCacheData($pCoord, Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param     string             $pCoord        Coordinate of the cell
+     * @throws     PHPExcel\Exception
+     * @return     PHPExcel\Cell     Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
+        }
+        $this->storeData();
+
+        //    Check if the entry that has been requested actually exists
+        if (!isset($this->cellCache[$pCoord])) {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = igbinary_unserialize($this->cellCache[$pCoord]);
+        //    Re-attach this as the cell's parent
+        $this->currentObject->attach($this);
+
+        //    Return requested entry
+        return $this->currentObject;
+    }
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  array of string
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
+
+        return parent::getCellList();
+    }
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     * @return    void
+     */
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+        $this->cellCache = array();
+
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+    }
+
+    /**
+     * Identify whether the caching method is currently available
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+     *
+     * @return    boolean
+     */
+    public static function cacheMethodIsAvailable()
+    {
+        return function_exists('igbinary_serialize');
+    }
+}
diff --git a/Classes/PHPExcel/CachedObjectStorage/Memcache.php b/Classes/PHPExcel/CachedObjectStorage/Memcache.php
index fa93050..4127e5a 100644
--- a/Classes/PHPExcel/CachedObjectStorage/Memcache.php
+++ b/Classes/PHPExcel/CachedObjectStorage/Memcache.php
@@ -1,333 +1,333 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2013 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-namespace PHPExcel;
-
-/**
- * PHPExcel\CachedObjectStorage_Memcache
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class CachedObjectStorage_Memcache extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
-{
-    /**
-     * Prefix used to uniquely identify cache data for this worksheet
-     *
-     * @var string
-     */
-    private $cachePrefix = null;
-
-    /**
-     * Cache timeout
-     *
-     * @var integer
-     */
-    private $cacheTime = 600;
-
-    /**
-     * Memcache interface
-     *
-     * @var resource
-     */
-    private $memcache = null;
-
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-     * @return    void
-     * @throws    PHPExcel\Exception
-     */
-    protected function storeData()
-    {
-        if ($this->currentCellIsDirty) {
-            $this->currentObject->detach();
-
-            $obj = serialize($this->currentObject);
-            if (!$this->memcache->replace(
-                $this->cachePrefix.$this->currentObjectID.'.cache',
-                $obj,
-                null,
-                $this->cacheTime
-            )) {
-                if (!$this->memcache->add($this->cachePrefix.$this->currentObjectID.'.cache',
-                    $obj,
-                    null,
-                    $this->cacheTime
-                )) {
-                    $this->__destruct();
-                    throw new Exception('Failed to store cell '.$this->currentObjectID.' in MemCache');
-                }
-            }
-            $this->currentCellIsDirty = false;
-        }
-        $this->currentObjectID = $this->currentObject = null;
-    }
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param    string            $pCoord        Coordinate address of the cell to update
-     * @param    PHPExcel\Cell    $cell        Cell to update
-     * @return    void
-     * @throws    PHPExcel\Exception
-     */
-    public function addCacheData($pCoord, Cell $cell)
-    {
-        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
-            $this->storeData();
-        }
-        $this->cellCache[$pCoord] = true;
-
-        $this->currentObjectID = $pCoord;
-        $this->currentObject = $cell;
-        $this->currentCellIsDirty = true;
-
-        return $cell;
-    }
-
-    /**
-     * Is a value set in the current PHPExcel\CachedObjectStorage_ICache for an indexed cell?
-     *
-     * @param    string        $pCoord        Coordinate address of the cell to check
-     * @return    void
-     * @return    boolean
-     */
-    public function isDataSet($pCoord)
-    {
-        //    Check if the requested entry is the current object, or exists in the cache
-        if (parent::isDataSet($pCoord)) {
-            if ($this->currentObjectID == $pCoord) {
-                return true;
-            }
-            //    Check if the requested entry still exists in Memcache
-            $success = $this->memcache->get($this->cachePrefix.$pCoord.'.cache');
-            if ($success === false) {
-                //    Entry no longer exists in Memcache, so clear it from the cache array
-                parent::deleteCacheData($pCoord);
-                throw new Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
-            }
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param     string             $pCoord        Coordinate of the cell
-     * @throws     PHPExcel\Exception
-     * @return     PHPExcel\Cell     Cell that was found, or null if not found
-     */
-    public function getCacheData($pCoord)
-    {
-        if ($pCoord === $this->currentObjectID)
-        {
-            return $this->currentObject;
-        }
-        $this->storeData();
-
-        //    Check if the entry that has been requested actually exists
-        if (parent::isDataSet($pCoord)) {
-            $obj = $this->memcache->get($this->cachePrefix.$pCoord.'.cache');
-            if ($obj === false) {
-                //    Entry no longer exists in Memcache, so clear it from the cache array
-                parent::deleteCacheData($pCoord);
-                throw new Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
-            }
-        } else {
-            //    Return null if requested entry doesn't exist in cache
-            return null;
-        }
-
-        //    Set current entry to the requested entry
-        $this->currentObjectID = $pCoord;
-        $this->currentObject = unserialize($obj);
-        //    Re-attach this as the cell's parent
-        $this->currentObject->attach($this);
-
-        //    Return requested entry
-        return $this->currentObject;
-    }
-
-    /**
-     * Get a list of all cell addresses currently held in cache
-     *
-     * @return  array of string
-     */
-    public function getCellList()
-    {
-        if ($this->currentObjectID !== null) {
-            $this->storeData();
-        }
-
-        return parent::getCellList();
-    }
-
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @param    string            $pCoord        Coordinate address of the cell to delete
-     * @throws    PHPExcel\Exception
-     */
-    public function deleteCacheData($pCoord)
-    {
-        //    Delete the entry from Memcache
-        $this->memcache->delete($this->cachePrefix.$pCoord.'.cache');
-
-        //    Delete the entry from our cell address array
-        parent::deleteCacheData($pCoord);
-    }
-
-    /**
-     * Clone the cell collection
-     *
-     * @param    PHPExcel\Worksheet    $parent        The new worksheet
-     * @throws    PHPExcel\Exception
-     * @return    void
-     */
-    public function copyCellCollection(Worksheet $parent)
-    {
-        parent::copyCellCollection($parent);
-        //    Get a new id for the new file name
-        $baseUnique = $this->getUniqueID();
-        $newCachePrefix = substr(md5($baseUnique), 0, 8).'.';
-        $cacheList = $this->getCellList();
-        foreach ($cacheList as $cellID) {
-            if ($cellID != $this->currentObjectID) {
-                $obj = $this->memcache->get($this->cachePrefix.$cellID.'.cache');
-                if ($obj === false) {
-                    //    Entry no longer exists in Memcache, so clear it from the cache array
-                    parent::deleteCacheData($cellID);
-                    throw new Exception('Cell entry '.$cellID.' no longer exists in MemCache');
-                }
-                if (!$this->memcache->add($newCachePrefix.$cellID.'.cache', $obj, null, $this->cacheTime)) {
-                    $this->__destruct();
-                    throw new Exception('Failed to store cell '.$cellID.' in MemCache');
-                }
-            }
-        }
-        $this->cachePrefix = $newCachePrefix;
-    }
-
-    /**
-     * Clear the cell collection and disconnect from our parent
-     *
-     * @return    void
-     */
-    public function unsetWorksheetCells()
-    {
-        if (!is_null($this->currentObject)) {
-            $this->currentObject->detach();
-            $this->currentObject = $this->currentObjectID = null;
-        }
-
-        //    Flush the Memcache cache
-        $this->__destruct();
-
-        $this->cellCache = array();
-
-        //    detach ourself from the worksheet, so that it can then delete this object successfully
-        $this->parent = null;
-    }
-
-    /**
-     * Initialise this new cell collection
-     *
-     * @param    PHPExcel\Worksheet    $parent        The worksheet for this cell collection
-     * @param    array of mixed        $arguments    Additional initialisation arguments
-     */
-    public function __construct(Worksheet $parent, $arguments)
-    {
-        $memcacheServer = (isset($arguments['memcacheServer'])) ? $arguments['memcacheServer'] : 'localhost';
-        $memcachePort   = (isset($arguments['memcachePort']))   ? $arguments['memcachePort']   : 11211;
-        $cacheTime      = (isset($arguments['cacheTime']))      ? $arguments['cacheTime']      : 600;
-
-        if (is_null($this->cachePrefix)) {
-            $baseUnique = $this->getUniqueID();
-            $this->cachePrefix = substr(md5($baseUnique), 0, 8).'.';
-
-            //    Set a new Memcache object and connect to the Memcache server
-            $this->memcache = new Memcache();
-            if (!$this->memcache->addServer(
-                $memcacheServer, 
-                $memcachePort, 
-                false, 
-                50, 
-                5, 
-                5, 
-                true, 
-                array($this, 'failureCallback')
-            )) {
-                throw new Exception(
-                    'Could not connect to MemCache server at '.$memcacheServer.':'.$memcachePort
-                );
-            }
-            $this->cacheTime = $cacheTime;
-
-            parent::__construct($parent);
-        }
-    }
-
-    /**
-     * Memcache error handler
-     *
-     * @param    string    $host        Memcache server
-     * @param    integer    $port        Memcache port
-     * @throws    PHPExcel\Exception
-     */
-    public function failureCallback($host, $port)
-    {
-        throw new Exception('memcache '.$host.':'.$port.' failed');
-    }
-
-    /**
-     * Destroy this cell collection
-     */
-    public function __destruct()
-    {
-        $cacheList = $this->getCellList();
-        foreach ($cacheList as $cellID) {
-            $this->memcache->delete($this->cachePrefix.$cellID.'.cache');
-        }
-    }
-
-    /**
-     * Identify whether the caching method is currently available
-     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-     *
-     * @return    boolean
-     */
-    public static function cacheMethodIsAvailable()
-    {
-        return function_exists('memcache_add');
-    }
-}
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2013 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+namespace PHPExcel;
+
+/**
+ * PHPExcel\CachedObjectStorage_Memcache
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class CachedObjectStorage_Memcache extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
+{
+    /**
+     * Prefix used to uniquely identify cache data for this worksheet
+     *
+     * @var string
+     */
+    private $cachePrefix = null;
+
+    /**
+     * Cache timeout
+     *
+     * @var integer
+     */
+    private $cacheTime = 600;
+
+    /**
+     * Memcache interface
+     *
+     * @var resource
+     */
+    private $memcache = null;
+
+
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+     * @return    void
+     * @throws    PHPExcel\Exception
+     */
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty) {
+            $this->currentObject->detach();
+
+            $obj = serialize($this->currentObject);
+            if (!$this->memcache->replace(
+                $this->cachePrefix.$this->currentObjectID.'.cache',
+                $obj,
+                null,
+                $this->cacheTime
+            )) {
+                if (!$this->memcache->add(
+                    $this->cachePrefix.$this->currentObjectID.'.cache',
+                    $obj,
+                    null,
+                    $this->cacheTime
+                )) {
+                    $this->__destruct();
+                    throw new Exception('Failed to store cell '.$this->currentObjectID.' in MemCache');
+                }
+            }
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
+    }
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel\Cell    $cell        Cell to update
+     * @return    void
+     * @throws    PHPExcel\Exception
+     */
+    public function addCacheData($pCoord, Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+        $this->cellCache[$pCoord] = true;
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }
+
+    /**
+     * Is a value set in the current PHPExcel\CachedObjectStorage_ICache for an indexed cell?
+     *
+     * @param    string        $pCoord        Coordinate address of the cell to check
+     * @return    void
+     * @return    boolean
+     */
+    public function isDataSet($pCoord)
+    {
+        //    Check if the requested entry is the current object, or exists in the cache
+        if (parent::isDataSet($pCoord)) {
+            if ($this->currentObjectID == $pCoord) {
+                return true;
+            }
+            //    Check if the requested entry still exists in Memcache
+            $success = $this->memcache->get($this->cachePrefix.$pCoord.'.cache');
+            if ($success === false) {
+                //    Entry no longer exists in Memcache, so clear it from the cache array
+                parent::deleteCacheData($pCoord);
+                throw new Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param     string             $pCoord        Coordinate of the cell
+     * @throws     PHPExcel\Exception
+     * @return     PHPExcel\Cell     Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
+        }
+        $this->storeData();
+
+        //    Check if the entry that has been requested actually exists
+        if (parent::isDataSet($pCoord)) {
+            $obj = $this->memcache->get($this->cachePrefix.$pCoord.'.cache');
+            if ($obj === false) {
+                //    Entry no longer exists in Memcache, so clear it from the cache array
+                parent::deleteCacheData($pCoord);
+                throw new Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
+            }
+        } else {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = unserialize($obj);
+        //    Re-attach this as the cell's parent
+        $this->currentObject->attach($this);
+
+        //    Return requested entry
+        return $this->currentObject;
+    }
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  array of string
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
+
+        return parent::getCellList();
+    }
+
+    /**
+     * Delete a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to delete
+     * @throws    PHPExcel\Exception
+     */
+    public function deleteCacheData($pCoord)
+    {
+        //    Delete the entry from Memcache
+        $this->memcache->delete($this->cachePrefix.$pCoord.'.cache');
+
+        //    Delete the entry from our cell address array
+        parent::deleteCacheData($pCoord);
+    }
+
+    /**
+     * Clone the cell collection
+     *
+     * @param    PHPExcel\Worksheet    $parent        The new worksheet
+     * @throws    PHPExcel\Exception
+     * @return    void
+     */
+    public function copyCellCollection(Worksheet $parent)
+    {
+        parent::copyCellCollection($parent);
+        //    Get a new id for the new file name
+        $baseUnique = $this->getUniqueID();
+        $newCachePrefix = substr(md5($baseUnique), 0, 8).'.';
+        $cacheList = $this->getCellList();
+        foreach ($cacheList as $cellID) {
+            if ($cellID != $this->currentObjectID) {
+                $obj = $this->memcache->get($this->cachePrefix.$cellID.'.cache');
+                if ($obj === false) {
+                    //    Entry no longer exists in Memcache, so clear it from the cache array
+                    parent::deleteCacheData($cellID);
+                    throw new Exception('Cell entry '.$cellID.' no longer exists in MemCache');
+                }
+                if (!$this->memcache->add($newCachePrefix.$cellID.'.cache', $obj, null, $this->cacheTime)) {
+                    $this->__destruct();
+                    throw new Exception('Failed to store cell '.$cellID.' in MemCache');
+                }
+            }
+        }
+        $this->cachePrefix = $newCachePrefix;
+    }
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     * @return    void
+     */
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+
+        //    Flush the Memcache cache
+        $this->__destruct();
+
+        $this->cellCache = array();
+
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+    }
+
+    /**
+     * Initialise this new cell collection
+     *
+     * @param    PHPExcel\Worksheet    $parent        The worksheet for this cell collection
+     * @param    array of mixed        $arguments    Additional initialisation arguments
+     */
+    public function __construct(Worksheet $parent, $arguments)
+    {
+        $memcacheServer = (isset($arguments['memcacheServer'])) ? $arguments['memcacheServer'] : 'localhost';
+        $memcachePort   = (isset($arguments['memcachePort']))   ? $arguments['memcachePort']   : 11211;
+        $cacheTime      = (isset($arguments['cacheTime']))      ? $arguments['cacheTime']      : 600;
+
+        if (is_null($this->cachePrefix)) {
+            $baseUnique = $this->getUniqueID();
+            $this->cachePrefix = substr(md5($baseUnique), 0, 8).'.';
+
+            //    Set a new Memcache object and connect to the Memcache server
+            $this->memcache = new Memcache();
+            if (!$this->memcache->addServer(
+                $memcacheServer,
+                $memcachePort,
+                false,
+                50,
+                5,
+                5,
+                true,
+                array($this, 'failureCallback')
+            )) {
+                throw new Exception(
+                    'Could not connect to MemCache server at '.$memcacheServer.':'.$memcachePort
+                );
+            }
+            $this->cacheTime = $cacheTime;
+
+            parent::__construct($parent);
+        }
+    }
+
+    /**
+     * Memcache error handler
+     *
+     * @param    string    $host        Memcache server
+     * @param    integer    $port        Memcache port
+     * @throws    PHPExcel\Exception
+     */
+    public function failureCallback($host, $port)
+    {
+        throw new Exception('memcache '.$host.':'.$port.' failed');
+    }
+
+    /**
+     * Destroy this cell collection
+     */
+    public function __destruct()
+    {
+        $cacheList = $this->getCellList();
+        foreach ($cacheList as $cellID) {
+            $this->memcache->delete($this->cachePrefix.$cellID.'.cache');
+        }
+    }
+
+    /**
+     * Identify whether the caching method is currently available
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+     *
+     * @return    boolean
+     */
+    public static function cacheMethodIsAvailable()
+    {
+        return function_exists('memcache_add');
+    }
+}
diff --git a/Classes/PHPExcel/CachedObjectStorage/Memory.php b/Classes/PHPExcel/CachedObjectStorage/Memory.php
index f29ae93..3da5d9b 100644
--- a/Classes/PHPExcel/CachedObjectStorage/Memory.php
+++ b/Classes/PHPExcel/CachedObjectStorage/Memory.php
@@ -1,126 +1,128 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2013 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-namespace PHPExcel;
-
-/**
- * PHPExcel\CachedObjectStorage_Memory
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class CachedObjectStorage_Memory extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
-{
-    /**
-     * Dummy method callable from CacheBase, but unused by Memory cache
-     *
-     * @return    void
-     */
-    protected function storeData() {
-    }
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param    string            $pCoord        Coordinate address of the cell to update
-     * @param    PHPExcel\Cell    $cell        Cell to update
-     * @return    PHPExcel\Cell
-     * @throws    PHPExcel\Exception
-     */
-    public function addCacheData($pCoord, Cell $cell) {
-        $this->cellCache[$pCoord] = $cell;
-
-        //    Set current entry to the new/updated entry
-        $this->currentObjectID = $pCoord;
-
-        return $cell;
-    }
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param     string             $pCoord        Coordinate of the cell
-     * @throws     PHPExcel\Exception
-     * @return     PHPExcel\Cell     Cell that was found, or null if not found
-     */
-    public function getCacheData($pCoord)
-    {
-        //    Check if the entry that has been requested actually exists
-        if (!isset($this->cellCache[$pCoord])) {
-            $this->currentObjectID = null;
-            //    Return null if requested entry doesn't exist in cache
-            return null;
-        }
-
-        //    Set current entry to the requested entry
-        $this->currentObjectID = $pCoord;
-
-        //    Return requested entry
-        return $this->cellCache[$pCoord];
-    }
-
-    /**
-     * Clone the cell collection
-     *
-     * @param    PHPExcel\Worksheet    $parent        The new worksheet
-     * @return    void
-     */
-    public function copyCellCollection(Worksheet $parent)
-    {
-        parent::copyCellCollection($parent);
-
-        $newCollection = array();
-        foreach($this->cellCache as $k => &$cell) {
-            $newCollection[$k] = clone $cell;
-            $newCollection[$k]->attach($this);
-        }
-
-        $this->cellCache = $newCollection;
-    }
-
-    /**
-     * Clear the cell collection and disconnect from our parent
-     *
-     * @return    void
-     */
-    public function unsetWorksheetCells()
-    {
-        //    Because cells are all stored as intact objects in memory, we need to detach each one from the parent
-        foreach($this->cellCache as $k => &$cell) {
-            $cell->detach();
-            $this->cellCache[$k] = null;
-        }
-        unset($cell);
-
-        $this->cellCache = array();
-
-        //    detach ourself from the worksheet, so that it can then delete this object successfully
-        $this->parent = null;
-    }
-}
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2013 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+namespace PHPExcel;
+
+/**
+ * PHPExcel\CachedObjectStorage_Memory
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class CachedObjectStorage_Memory extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
+{
+    /**
+     * Dummy method callable from CacheBase, but unused by Memory cache
+     *
+     * @return    void
+     */
+    protected function storeData()
+    {
+    }
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel\Cell    $cell        Cell to update
+     * @return    PHPExcel\Cell
+     * @throws    PHPExcel\Exception
+     */
+    public function addCacheData($pCoord, Cell $cell)
+    {
+        $this->cellCache[$pCoord] = $cell;
+
+        //    Set current entry to the new/updated entry
+        $this->currentObjectID = $pCoord;
+
+        return $cell;
+    }
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param     string             $pCoord        Coordinate of the cell
+     * @throws     PHPExcel\Exception
+     * @return     PHPExcel\Cell     Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        //    Check if the entry that has been requested actually exists
+        if (!isset($this->cellCache[$pCoord])) {
+            $this->currentObjectID = null;
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+
+        //    Return requested entry
+        return $this->cellCache[$pCoord];
+    }
+
+    /**
+     * Clone the cell collection
+     *
+     * @param    PHPExcel\Worksheet    $parent        The new worksheet
+     * @return    void
+     */
+    public function copyCellCollection(Worksheet $parent)
+    {
+        parent::copyCellCollection($parent);
+
+        $newCollection = array();
+        foreach ($this->cellCache as $k => &$cell) {
+            $newCollection[$k] = clone $cell;
+            $newCollection[$k]->attach($this);
+        }
+
+        $this->cellCache = $newCollection;
+    }
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     * @return    void
+     */
+    public function unsetWorksheetCells()
+    {
+        //    Because cells are all stored as intact objects in memory, we need to detach each one from the parent
+        foreach ($this->cellCache as $k => &$cell) {
+            $cell->detach();
+            $this->cellCache[$k] = null;
+        }
+        unset($cell);
+
+        $this->cellCache = array();
+
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+    }
+}
diff --git a/Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php b/Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php
index 5022cb4..52e1d77 100644
--- a/Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php
+++ b/Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php
@@ -1,138 +1,139 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2013 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-namespace PHPExcel;
-
-/**
- * PHPExcel\CachedObjectStorage_MemoryGZip
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class CachedObjectStorage_MemoryGZip extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
-{
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-     * @return    void
-     * @throws    PHPExcel\Exception
-     */
-    protected function storeData()
-    {
-        if ($this->currentCellIsDirty) {
-            $this->currentObject->detach();
-
-            $this->cellCache[$this->currentObjectID] = gzdeflate(serialize($this->currentObject));
-            $this->currentCellIsDirty = false;
-        }
-        $this->currentObjectID = $this->currentObject = null;
-    }
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param    string            $pCoord        Coordinate address of the cell to update
-     * @param    PHPExcel\Cell    $cell        Cell to update
-     * @return    void
-     * @throws    PHPExcel\Exception
-     */
-    public function addCacheData($pCoord, Cell $cell)
-    {
-        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
-            $this->storeData();
-        }
-
-        $this->currentObjectID = $pCoord;
-        $this->currentObject = $cell;
-        $this->currentCellIsDirty = true;
-
-        return $cell;
-    }
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param     string             $pCoord        Coordinate of the cell
-     * @throws     PHPExcel\Exception
-     * @return     PHPExcel\Cell     Cell that was found, or null if not found
-     */
-    public function getCacheData($pCoord)
-    {
-        if ($pCoord === $this->currentObjectID) {
-            return $this->currentObject;
-        }
-        $this->storeData();
-
-        //    Check if the entry that has been requested actually exists
-        if (!isset($this->cellCache[$pCoord])) {
-            //    Return null if requested entry doesn't exist in cache
-            return null;
-        }
-
-        //    Set current entry to the requested entry
-        $this->currentObjectID = $pCoord;
-        $this->currentObject = unserialize(gzinflate($this->cellCache[$pCoord]));
-        //    Re-attach this as the cell's parent
-        $this->currentObject->attach($this);
-
-        //    Return requested entry
-        return $this->currentObject;
-    }
-
-    /**
-     * Get a list of all cell addresses currently held in cache
-     *
-     * @return  array of string
-     */
-    public function getCellList() {
-        if ($this->currentObjectID !== null) {
-            $this->storeData();
-        }
-
-        return parent::getCellList();
-    }
-
-    /**
-     * Clear the cell collection and disconnect from our parent
-     *
-     * @return    void
-     */
-    public function unsetWorksheetCells()
-    {
-        if(!is_null($this->currentObject)) {
-            $this->currentObject->detach();
-            $this->currentObject = $this->currentObjectID = null;
-        }
-        $this->cellCache = array();
-
-        //    detach ourself from the worksheet, so that it can then delete this object successfully
-        $this->parent = null;
-    }
-}
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2013 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+namespace PHPExcel;
+
+/**
+ * PHPExcel\CachedObjectStorage_MemoryGZip
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class CachedObjectStorage_MemoryGZip extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
+{
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+     * @return    void
+     * @throws    PHPExcel\Exception
+     */
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty) {
+            $this->currentObject->detach();
+
+            $this->cellCache[$this->currentObjectID] = gzdeflate(serialize($this->currentObject));
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
+    }
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel\Cell    $cell        Cell to update
+     * @return    void
+     * @throws    PHPExcel\Exception
+     */
+    public function addCacheData($pCoord, Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param     string             $pCoord        Coordinate of the cell
+     * @throws     PHPExcel\Exception
+     * @return     PHPExcel\Cell     Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
+        }
+        $this->storeData();
+
+        //    Check if the entry that has been requested actually exists
+        if (!isset($this->cellCache[$pCoord])) {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = unserialize(gzinflate($this->cellCache[$pCoord]));
+        //    Re-attach this as the cell's parent
+        $this->currentObject->attach($this);
+
+        //    Return requested entry
+        return $this->currentObject;
+    }
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  array of string
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
+
+        return parent::getCellList();
+    }
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     * @return    void
+     */
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+        $this->cellCache = array();
+
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+    }
+}
diff --git a/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php b/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php
index e6a9361..e6b8dd0 100644
--- a/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php
+++ b/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php
@@ -1,139 +1,139 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2013 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-namespace PHPExcel;
-
-/**
- * PHPExcel\CachedObjectStorage_MemorySerialized
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class CachedObjectStorage_MemorySerialized extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
-{
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-     * @return    void
-     * @throws    PHPExcel\Exception
-     */
-    protected function storeData()
-    {
-        if ($this->currentCellIsDirty) {
-            $this->currentObject->detach();
-
-            $this->cellCache[$this->currentObjectID] = serialize($this->currentObject);
-            $this->currentCellIsDirty = false;
-        }
-        $this->currentObjectID = $this->currentObject = null;
-    }
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param    string            $pCoord        Coordinate address of the cell to update
-     * @param    PHPExcel\Cell    $cell        Cell to update
-     * @return    void
-     * @throws    PHPExcel\Exception
-     */
-    public function addCacheData($pCoord, Cell $cell)
-    {
-        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
-            $this->storeData();
-        }
-
-        $this->currentObjectID = $pCoord;
-        $this->currentObject = $cell;
-        $this->currentCellIsDirty = true;
-
-        return $cell;
-    }
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param     string             $pCoord        Coordinate of the cell
-     * @throws     PHPExcel\Exception
-     * @return     PHPExcel\Cell     Cell that was found, or null if not found
-     */
-    public function getCacheData($pCoord)
-    {
-        if ($pCoord === $this->currentObjectID) {
-            return $this->currentObject;
-        }
-        $this->storeData();
-
-        //    Check if the entry that has been requested actually exists
-        if (!isset($this->cellCache[$pCoord])) {
-            //    Return null if requested entry doesn't exist in cache
-            return null;
-        }
-
-        //    Set current entry to the requested entry
-        $this->currentObjectID = $pCoord;
-        $this->currentObject = unserialize($this->cellCache[$pCoord]);
-        //    Re-attach this as the cell's parent
-        $this->currentObject->attach($this);
-
-        //    Return requested entry
-        return $this->currentObject;
-    }
-
-    /**
-     * Get a list of all cell addresses currently held in cache
-     *
-     * @return  array of string
-     */
-    public function getCellList()
-    {
-        if ($this->currentObjectID !== null) {
-            $this->storeData();
-        }
-
-        return parent::getCellList();
-    }
-
-    /**
-     * Clear the cell collection and disconnect from our parent
-     *
-     * @return    void
-     */
-    public function unsetWorksheetCells()
-    {
-        if(!is_null($this->currentObject)) {
-            $this->currentObject->detach();
-            $this->currentObject = $this->currentObjectID = null;
-        }
-        $this->cellCache = array();
-
-        //    detach ourself from the worksheet, so that it can then delete this object successfully
-        $this->parent = null;
-    }
-}
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2013 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+namespace PHPExcel;
+
+/**
+ * PHPExcel\CachedObjectStorage_MemorySerialized
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class CachedObjectStorage_MemorySerialized extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
+{
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+     * @return    void
+     * @throws    PHPExcel\Exception
+     */
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty) {
+            $this->currentObject->detach();
+
+            $this->cellCache[$this->currentObjectID] = serialize($this->currentObject);
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
+    }
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel\Cell    $cell        Cell to update
+     * @return    void
+     * @throws    PHPExcel\Exception
+     */
+    public function addCacheData($pCoord, Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param     string             $pCoord        Coordinate of the cell
+     * @throws     PHPExcel\Exception
+     * @return     PHPExcel\Cell     Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
+        }
+        $this->storeData();
+
+        //    Check if the entry that has been requested actually exists
+        if (!isset($this->cellCache[$pCoord])) {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = unserialize($this->cellCache[$pCoord]);
+        //    Re-attach this as the cell's parent
+        $this->currentObject->attach($this);
+
+        //    Return requested entry
+        return $this->currentObject;
+    }
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  array of string
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
+
+        return parent::getCellList();
+    }
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     * @return    void
+     */
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+        $this->cellCache = array();
+
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+    }
+}
diff --git a/Classes/PHPExcel/CachedObjectStorage/PHPTemp.php b/Classes/PHPExcel/CachedObjectStorage/PHPTemp.php
index 71981db..4c8063b 100644
--- a/Classes/PHPExcel/CachedObjectStorage/PHPTemp.php
+++ b/Classes/PHPExcel/CachedObjectStorage/PHPTemp.php
@@ -1,206 +1,208 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2013 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel\CachedObjectStorage_PHPTemp
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class CachedObjectStorage_PHPTemp extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
-{
-    /**
-     * Name of the file for this cache
-     *
-     * @var string
-     */
-    private $fileHandle = null;
-
-    /**
-     * Memory limit to use before reverting to file cache
-     *
-     * @var integer
-     */
-    private $memoryCacheSize = null;
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-     * @return    void
-     * @throws    PHPExcel\Exception
-     */
-    protected function storeData()
-    {
-        if ($this->currentCellIsDirty) {
-            $this->currentObject->detach();
-
-            fseek($this->fileHandle,0,SEEK_END);
-            $offset = ftell($this->fileHandle);
-            fwrite($this->fileHandle, serialize($this->currentObject));
-            $this->cellCache[$this->currentObjectID]    = array('ptr' => $offset,
-                                                                'sz'  => ftell($this->fileHandle) - $offset
-                                                               );
-            $this->currentCellIsDirty = false;
-        }
-        $this->currentObjectID = $this->currentObject = null;
-    }
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param    string            $pCoord        Coordinate address of the cell to update
-     * @param    PHPExcel\Cell    $cell        Cell to update
-     * @return    void
-     * @throws    PHPExcel\Exception
-     */
-    public function addCacheData($pCoord, Cell $cell)
-    {
-        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
-            $this->storeData();
-        }
-
-        $this->currentObjectID = $pCoord;
-        $this->currentObject = $cell;
-        $this->currentCellIsDirty = true;
-
-        return $cell;
-    }
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param     string             $pCoord        Coordinate of the cell
-     * @throws     PHPExcel\Exception
-     * @return     PHPExcel\Cell     Cell that was found, or null if not found
-     */
-    public function getCacheData($pCoord)
-    {
-        if ($pCoord === $this->currentObjectID) {
-            return $this->currentObject;
-        }
-        $this->storeData();
-
-        //    Check if the entry that has been requested actually exists
-        if (!isset($this->cellCache[$pCoord])) {
-            //    Return null if requested entry doesn't exist in cache
-            return null;
-        }
-
-        //    Set current entry to the requested entry
-        $this->currentObjectID = $pCoord;
-        fseek($this->fileHandle,$this->cellCache[$pCoord]['ptr']);
-        $this->currentObject = unserialize(fread($this->fileHandle,$this->cellCache[$pCoord]['sz']));
-        //    Re-attach this as the cell's parent
-        $this->currentObject->attach($this);
-
-        //    Return requested entry
-        return $this->currentObject;
-    }
-
-    /**
-     * Get a list of all cell addresses currently held in cache
-     *
-     * @return  array of string
-     */
-    public function getCellList()
-    {
-        if ($this->currentObjectID !== null) {
-            $this->storeData();
-        }
-
-        return parent::getCellList();
-    }
-
-    /**
-     * Clone the cell collection
-     *
-     * @param    PHPExcel\Worksheet    $parent        The new worksheet
-     * @return    void
-     */
-    public function copyCellCollection(Worksheet $parent)
-    {
-        parent::copyCellCollection($parent);
-        //    Open a new stream for the cell cache data
-        $newFileHandle = fopen('php://temp/maxmemory:'.$this->memoryCacheSize,'a+');
-        //    Copy the existing cell cache data to the new stream
-        fseek($this->fileHandle,0);
-        while (!feof($this->fileHandle)) {
-            fwrite($newFileHandle,fread($this->fileHandle, 1024));
-        }
-        $this->fileHandle = $newFileHandle;
-    }
-
-    /**
-     * Clear the cell collection and disconnect from our parent
-     *
-     * @return    void
-     */
-    public function unsetWorksheetCells()
-    {
-        if(!is_null($this->currentObject)) {
-            $this->currentObject->detach();
-            $this->currentObject = $this->currentObjectID = null;
-        }
-        $this->cellCache = array();
-
-        //    detach ourself from the worksheet, so that it can then delete this object successfully
-        $this->parent = null;
-
-        //    Close down the php://temp file
-        $this->__destruct();
-    }
-
-    /**
-     * Initialise this new cell collection
-     *
-     * @param    PHPExcel\Worksheet    $parent        The worksheet for this cell collection
-     * @param    array of mixed        $arguments    Additional initialisation arguments
-     */
-    public function __construct(Worksheet $parent, $arguments)
-    {
-        $this->memoryCacheSize = (isset($arguments['memoryCacheSize'])) ? $arguments['memoryCacheSize'] : '1MB';
-
-        parent::__construct($parent);
-        if (is_null($this->fileHandle)) {
-            $this->fileHandle = fopen('php://temp/maxmemory:'.$this->memoryCacheSize,'a+');
-        }
-    }
-
-    /**
-     * Destroy this cell collection
-     */
-    public function __destruct()
-    {
-        if (!is_null($this->fileHandle)) {
-            fclose($this->fileHandle);
-        }
-        $this->fileHandle = null;
-    }
-}
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2013 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+namespace PHPExcel;
+
+/**
+ * PHPExcel\CachedObjectStorage_PHPTemp
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class CachedObjectStorage_PHPTemp extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
+{
+    /**
+     * Name of the file for this cache
+     *
+     * @var string
+     */
+    private $fileHandle = null;
+
+    /**
+     * Memory limit to use before reverting to file cache
+     *
+     * @var integer
+     */
+    private $memoryCacheSize = null;
+
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+     * @return    void
+     * @throws    PHPExcel\Exception
+     */
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty) {
+            $this->currentObject->detach();
+
+            fseek($this->fileHandle, 0, SEEK_END);
+            $offset = ftell($this->fileHandle);
+            fwrite($this->fileHandle, serialize($this->currentObject));
+            $this->cellCache[$this->currentObjectID]    = array('ptr' => $offset,
+                                                                'sz'  => ftell($this->fileHandle) - $offset
+                                                               );
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
+    }
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel\Cell    $cell        Cell to update
+     * @return    void
+     * @throws    PHPExcel\Exception
+     */
+    public function addCacheData($pCoord, Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param     string             $pCoord        Coordinate of the cell
+     * @throws     PHPExcel\Exception
+     * @return     PHPExcel\Cell     Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
+        }
+        $this->storeData();
+
+        //    Check if the entry that has been requested actually exists
+        if (!isset($this->cellCache[$pCoord])) {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+        fseek($this->fileHandle, $this->cellCache[$pCoord]['ptr']);
+        $this->currentObject = unserialize(fread($this->fileHandle, $this->cellCache[$pCoord]['sz']));
+        //    Re-attach this as the cell's parent
+        $this->currentObject->attach($this);
+
+        //    Return requested entry
+        return $this->currentObject;
+    }
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  array of string
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
+
+        return parent::getCellList();
+    }
+
+    /**
+     * Clone the cell collection
+     *
+     * @param    PHPExcel\Worksheet    $parent        The new worksheet
+     * @return    void
+     */
+    public function copyCellCollection(Worksheet $parent)
+    {
+        parent::copyCellCollection($parent);
+        //    Open a new stream for the cell cache data
+        $newFileHandle = fopen('php://temp/maxmemory:'.$this->memoryCacheSize, 'a+');
+        //    Copy the existing cell cache data to the new stream
+        fseek($this->fileHandle, 0);
+        while (!feof($this->fileHandle)) {
+            fwrite($newFileHandle, fread($this->fileHandle, 1024));
+        }
+        $this->fileHandle = $newFileHandle;
+    }
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     * @return    void
+     */
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+        $this->cellCache = array();
+
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+
+        //    Close down the php://temp file
+        $this->__destruct();
+    }
+
+    /**
+     * Initialise this new cell collection
+     *
+     * @param    PHPExcel\Worksheet    $parent        The worksheet for this cell collection
+     * @param    array of mixed        $arguments    Additional initialisation arguments
+     */
+    public function __construct(Worksheet $parent, $arguments)
+    {
+        $this->memoryCacheSize = (isset($arguments['memoryCacheSize'])) ? $arguments['memoryCacheSize'] : '1MB';
+
+        parent::__construct($parent);
+        if (is_null($this->fileHandle)) {
+            $this->fileHandle = fopen('php://temp/maxmemory:'.$this->memoryCacheSize, 'a+');
+        }
+    }
+
+    /**
+     * Destroy this cell collection
+     */
+    public function __destruct()
+    {
+        if (!is_null($this->fileHandle)) {
+            fclose($this->fileHandle);
+        }
+        $this->fileHandle = null;
+    }
+}
diff --git a/Classes/PHPExcel/CachedObjectStorage/SQLite.php b/Classes/PHPExcel/CachedObjectStorage/SQLite.php
index feef8b1..9df9bc1 100644
--- a/Classes/PHPExcel/CachedObjectStorage/SQLite.php
+++ b/Classes/PHPExcel/CachedObjectStorage/SQLite.php
@@ -1,305 +1,319 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2013 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-namespace PHPExcel;
-
-/**
- * PHPExcel\CachedObjectStorage_SQLite
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class CachedObjectStorage_SQLite extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
-{
-    /**
-     * Database table name
-     *
-     * @var string
-     */
-    private $TableName = null;
-
-    /**
-     * Database handle
-     *
-     * @var resource
-     */
-    private $DBHandle = null;
-
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-     * @return    void
-     * @throws    PHPExcel\Exception
-     */
-    protected function storeData()
-    {
-        if ($this->currentCellIsDirty) {
-            $this->currentObject->detach();
-
-            if (!$this->DBHandle->queryExec("INSERT OR REPLACE INTO kvp_".$this->TableName." VALUES('".$this->currentObjectID."','".sqlite_escape_string(serialize($this->currentObject))."')"))
-                throw new Exception(sqlite_error_string($this->DBHandle->lastError()));
-            $this->currentCellIsDirty = false;
-        }
-        $this->currentObjectID = $this->currentObject = null;
-    }
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param    string            $pCoord        Coordinate address of the cell to update
-     * @param    PHPExcel\Cell    $cell        Cell to update
-     * @return    void
-     * @throws    PHPExcel\Exception
-     */
-    public function addCacheData($pCoord, Cell $cell)
-    {
-        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
-            $this->storeData();
-        }
-
-        $this->currentObjectID = $pCoord;
-        $this->currentObject = $cell;
-        $this->currentCellIsDirty = true;
-
-        return $cell;
-    }
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param     string             $pCoord        Coordinate of the cell
-     * @throws     PHPExcel\Exception
-     * @return     PHPExcel\Cell     Cell that was found, or null if not found
-     */
-    public function getCacheData($pCoord)
-    {
-        if ($pCoord === $this->currentObjectID) {
-            return $this->currentObject;
-        }
-        $this->storeData();
-
-        $query = "SELECT value FROM kvp_".$this->TableName." WHERE id='".$pCoord."'";
-        $cellResultSet = $this->DBHandle->query($query,SQLITE_ASSOC);
-        if ($cellResultSet === false) {
-            throw new Exception(sqlite_error_string($this->DBHandle->lastError()));
-        } elseif ($cellResultSet->numRows() == 0) {
-            //    Return null if requested entry doesn't exist in cache
-            return null;
-        }
-
-        //    Set current entry to the requested entry
-        $this->currentObjectID = $pCoord;
-
-        $cellResult = $cellResultSet->fetchSingle();
-        $this->currentObject = unserialize($cellResult);
-        //    Re-attach this as the cell's parent
-        $this->currentObject->attach($this);
-
-        //    Return requested entry
-        return $this->currentObject;
-    }
-
-    /**
-     * Is a value set for an indexed cell?
-     *
-     * @param    string        $pCoord        Coordinate address of the cell to check
-     * @return    boolean
-     */
-    public function isDataSet($pCoord)
-    {
-        if ($pCoord === $this->currentObjectID) {
-            return true;
-        }
-
-        //    Check if the requested entry exists in the cache
-        $query = "SELECT id FROM kvp_".$this->TableName." WHERE id='".$pCoord."'";
-        $cellResultSet = $this->DBHandle->query($query,SQLITE_ASSOC);
-        if ($cellResultSet === false) {
-            throw new Exception(sqlite_error_string($this->DBHandle->lastError()));
-        } elseif ($cellResultSet->numRows() == 0) {
-            //    Return null if requested entry doesn't exist in cache
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @param    string            $pCoord        Coordinate address of the cell to delete
-     * @throws    PHPExcel\Exception
-     */
-    public function deleteCacheData($pCoord)
-    {
-        if ($pCoord === $this->currentObjectID) {
-            $this->currentObject->detach();
-            $this->currentObjectID = $this->currentObject = null;
-        }
-
-        //    Check if the requested entry exists in the cache
-        $query = "DELETE FROM kvp_".$this->TableName." WHERE id='".$pCoord."'";
-        if (!$this->DBHandle->queryExec($query))
-            throw new Exception(sqlite_error_string($this->DBHandle->lastError()));
-
-        $this->currentCellIsDirty = false;
-    }
-
-    /**
-     * Move a cell object from one address to another
-     *
-     * @param    string        $fromAddress    Current address of the cell to move
-     * @param    string        $toAddress        Destination address of the cell to move
-     * @return    boolean
-     */
-    public function moveCell($fromAddress, $toAddress)
-    {
-        if ($fromAddress === $this->currentObjectID) {
-            $this->currentObjectID = $toAddress;
-        }
-
-        $query = "DELETE FROM kvp_".$this->TableName." WHERE id='".$toAddress."'";
-        $result = $this->DBHandle->exec($query);
-        if ($result === false)
-            throw new Exception($this->DBHandle->lastErrorMsg());
-
-        $query = "UPDATE kvp_".$this->TableName." SET id='".$toAddress."' WHERE id='".$fromAddress."'";
-        $result = $this->DBHandle->exec($query);
-        if ($result === false)
-            throw new Exception($this->DBHandle->lastErrorMsg());
-
-        return true;
-    }
-
-    /**
-     * Get a list of all cell addresses currently held in cache
-     *
-     * @return    array of string
-     */
-    public function getCellList()
-    {
-        if ($this->currentObjectID !== null) {
-            $this->storeData();
-        }
-
-        $query = "SELECT id FROM kvp_".$this->TableName;
-        $cellIdsResult = $this->DBHandle->unbufferedQuery($query,SQLITE_ASSOC);
-        if ($cellIdsResult === false)
-            throw new Exception(sqlite_error_string($this->DBHandle->lastError()));
-
-        $cellKeys = array();
-        foreach($cellIdsResult as $row) {
-            $cellKeys[] = $row['id'];
-        }
-
-        return $cellKeys;
-    }
-
-    /**
-     * Clone the cell collection
-     *
-     * @param    PHPExcel\Worksheet    $parent        The new worksheet
-     * @return    void
-     */
-    public function copyCellCollection(Worksheet $parent)
-    {
-        $this->currentCellIsDirty;
-        $this->storeData();
-
-        //    Get a new id for the new table name
-        $tableName = str_replace('.','_',$this->getUniqueID());
-        if (!$this->DBHandle->queryExec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
-                                                    AS SELECT * FROM kvp_'.$this->TableName))
-            throw new Exception(sqlite_error_string($this->DBHandle->lastError()));
-
-        //    Copy the existing cell cache file
-        $this->TableName = $tableName;
-    }
-
-    /**
-     * Clear the cell collection and disconnect from our parent
-     *
-     * @return    void
-     */
-    public function unsetWorksheetCells()
-    {
-        if(!is_null($this->currentObject)) {
-            $this->currentObject->detach();
-            $this->currentObject = $this->currentObjectID = null;
-        }
-        //    detach ourself from the worksheet, so that it can then delete this object successfully
-        $this->parent = null;
-
-        //    Close down the temporary cache file
-        $this->__destruct();
-    }
-
-    /**
-     * Initialise this new cell collection
-     *
-     * @param    PHPExcel\Worksheet    $parent        The worksheet for this cell collection
-     */
-    public function __construct(Worksheet $parent)
-    {
-        parent::__construct($parent);
-        if (is_null($this->DBHandle)) {
-            $this->TableName = str_replace('.','_',$this->getUniqueID());
-            $DBName = ':memory:';
-
-            $this->DBHandle = new SQLiteDatabase($DBName);
-            if ($this->DBHandle === false)
-                throw new Exception(sqlite_error_string($this->DBHandle->lastError()));
-            if (!$this->DBHandle->queryExec('CREATE TABLE kvp_'.$this->TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
-                throw new Exception(sqlite_error_string($this->DBHandle->lastError()));
-        }
-    }
-
-    /**
-     * Destroy this cell collection
-     */
-    public function __destruct()
-    {
-        if (!is_null($this->DBHandle)) {
-            $this->DBHandle->queryExec('DROP TABLE kvp_'.$this->TableName);
-        }
-        $this->DBHandle = null;
-    }
-
-    /**
-     * Identify whether the caching method is currently available
-     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-     *
-     * @return    boolean
-     */
-    public static function cacheMethodIsAvailable()
-    {
-        return function_exists('sqlite_open');
-    }
-}
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2013 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+namespace PHPExcel;
+
+/**
+ * PHPExcel\CachedObjectStorage_SQLite
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class CachedObjectStorage_SQLite extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
+{
+    /**
+     * Database table name
+     *
+     * @var string
+     */
+    private $TableName = null;
+
+    /**
+     * Database handle
+     *
+     * @var resource
+     */
+    private $DBHandle = null;
+
+
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+     * @return    void
+     * @throws    PHPExcel\Exception
+     */
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty) {
+            $this->currentObject->detach();
+            $query = "INSERT OR REPLACE INTO kvp_" . $this->TableName .
+                " VALUES('" . $this->currentObjectID . "','" .
+                sqlite_escape_string(serialize($this->currentObject)) . "')";
+            if (!$this->DBHandle->queryExec($query)) {
+                throw new Exception(sqlite_error_string($this->DBHandle->lastError()));
+            }
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
+    }
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel\Cell    $cell        Cell to update
+     * @return    void
+     * @throws    PHPExcel\Exception
+     */
+    public function addCacheData($pCoord, Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param     string             $pCoord        Coordinate of the cell
+     * @throws     PHPExcel\Exception
+     * @return     PHPExcel\Cell     Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
+        }
+        $this->storeData();
+
+        $query = "SELECT value FROM kvp_".$this->TableName." WHERE id='".$pCoord."'";
+        $cellResultSet = $this->DBHandle->query($query, SQLITE_ASSOC);
+        if ($cellResultSet === false) {
+            throw new Exception(sqlite_error_string($this->DBHandle->lastError()));
+        } elseif ($cellResultSet->numRows() == 0) {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+
+        $cellResult = $cellResultSet->fetchSingle();
+        $this->currentObject = unserialize($cellResult);
+        //    Re-attach this as the cell's parent
+        $this->currentObject->attach($this);
+
+        //    Return requested entry
+        return $this->currentObject;
+    }
+
+    /**
+     * Is a value set for an indexed cell?
+     *
+     * @param    string        $pCoord        Coordinate address of the cell to check
+     * @return    boolean
+     */
+    public function isDataSet($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return true;
+        }
+
+        //    Check if the requested entry exists in the cache
+        $query = "SELECT id FROM kvp_".$this->TableName." WHERE id='".$pCoord."'";
+        $cellResultSet = $this->DBHandle->query($query, SQLITE_ASSOC);
+        if ($cellResultSet === false) {
+            throw new Exception(sqlite_error_string($this->DBHandle->lastError()));
+        } elseif ($cellResultSet->numRows() == 0) {
+            //    Return null if requested entry doesn't exist in cache
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Delete a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to delete
+     * @throws    PHPExcel\Exception
+     */
+    public function deleteCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            $this->currentObject->detach();
+            $this->currentObjectID = $this->currentObject = null;
+        }
+
+        //    Check if the requested entry exists in the cache
+        $query = "DELETE FROM kvp_".$this->TableName." WHERE id='".$pCoord."'";
+        if (!$this->DBHandle->queryExec($query)) {
+            throw new Exception(sqlite_error_string($this->DBHandle->lastError()));
+        }
+
+        $this->currentCellIsDirty = false;
+    }
+
+    /**
+     * Move a cell object from one address to another
+     *
+     * @param    string        $fromAddress    Current address of the cell to move
+     * @param    string        $toAddress        Destination address of the cell to move
+     * @return    boolean
+     */
+    public function moveCell($fromAddress, $toAddress)
+    {
+        if ($fromAddress === $this->currentObjectID) {
+            $this->currentObjectID = $toAddress;
+        }
+
+        $query = "DELETE FROM kvp_".$this->TableName." WHERE id='".$toAddress."'";
+        if (!$this->DBHandle->exec($query)) {
+            throw new Exception($this->DBHandle->lastErrorMsg());
+        }
+
+        $query = "UPDATE kvp_".$this->TableName." SET id='".$toAddress."' WHERE id='".$fromAddress."'";
+        if (!$this->DBHandle->exec($query)) {
+            throw new Exception($this->DBHandle->lastErrorMsg());
+        }
+
+        return true;
+    }
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return    array of string
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
+
+        $query = "SELECT id FROM kvp_".$this->TableName;
+        $cellIdsResult = $this->DBHandle->unbufferedQuery($query, SQLITE_ASSOC);
+        if (!$cellIdsResult) {
+            throw new Exception(sqlite_error_string($this->DBHandle->lastError()));
+        }
+
+        $cellKeys = array();
+        foreach ($cellIdsResult as $row) {
+            $cellKeys[] = $row['id'];
+        }
+
+        return $cellKeys;
+    }
+
+    /**
+     * Clone the cell collection
+     *
+     * @param    PHPExcel\Worksheet    $parent        The new worksheet
+     * @return    void
+     */
+    public function copyCellCollection(Worksheet $parent)
+    {
+        $this->currentCellIsDirty;
+        $this->storeData();
+
+        //    Get a new id for the new table name
+        $tableName = str_replace('.', '_', $this->getUniqueID());
+        $result = $this->DBHandle->queryExec(
+            'CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
+                AS SELECT * FROM kvp_'.$this->TableName
+        );
+        if (!$result) {
+            throw new Exception(sqlite_error_string($this->DBHandle->lastError()));
+        }
+
+        //    Copy the existing cell cache file
+        $this->TableName = $tableName;
+    }
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     * @return    void
+     */
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+
+        //    Close down the temporary cache file
+        $this->__destruct();
+    }
+
+    /**
+     * Initialise this new cell collection
+     *
+     * @param    PHPExcel\Worksheet    $parent        The worksheet for this cell collection
+     */
+    public function __construct(Worksheet $parent)
+    {
+        parent::__construct($parent);
+        if (is_null($this->DBHandle)) {
+            $this->TableName = str_replace('.', '_', $this->getUniqueID());
+            $DBName = ':memory:';
+
+            $this->DBHandle = new SQLiteDatabase($DBName);
+            if (!$this->DBHandle) {
+                throw new Exception(sqlite_error_string($this->DBHandle->lastError()));
+            }
+            $result = $this->DBHandle->queryExec(
+                'CREATE TABLE kvp_'.$this->TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'
+            );
+            if (!$result) {
+                throw new Exception(sqlite_error_string($this->DBHandle->lastError()));
+            }
+        }
+    }
+
+    /**
+     * Destroy this cell collection
+     */
+    public function __destruct()
+    {
+        if (!is_null($this->DBHandle)) {
+            $this->DBHandle->queryExec('DROP TABLE kvp_'.$this->TableName);
+        }
+        $this->DBHandle = null;
+    }
+
+    /**
+     * Identify whether the caching method is currently available
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+     *
+     * @return    boolean
+     */
+    public static function cacheMethodIsAvailable()
+    {
+        return function_exists('sqlite_open');
+    }
+}
diff --git a/Classes/PHPExcel/CachedObjectStorage/SQLite3.php b/Classes/PHPExcel/CachedObjectStorage/SQLite3.php
index 0f2c907..e397011 100644
--- a/Classes/PHPExcel/CachedObjectStorage/SQLite3.php
+++ b/Classes/PHPExcel/CachedObjectStorage/SQLite3.php
@@ -1,345 +1,363 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2013 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-namespace PHPExcel;
-
-/**
- * PHPExcel\CachedObjectStorage_SQLite3
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class CachedObjectStorage_SQLite3 extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
-{
-    /**
-     * Database table name
-     *
-     * @var string
-     */
-    private $TableName = null;
-
-    /**
-     * Database handle
-     *
-     * @var resource
-     */
-    private $DBHandle = null;
-
-    /**
-     * Prepared statement for a SQLite3 select query
-     *
-     * @var SQLite3Stmt
-     */
-    private $selectQuery;
-
-    /**
-     * Prepared statement for a SQLite3 insert query
-     *
-     * @var SQLite3Stmt
-     */
-    private $insertQuery;
-
-    /**
-     * Prepared statement for a SQLite3 update query
-     *
-     * @var SQLite3Stmt
-     */
-    private $updateQuery;
-
-    /**
-     * Prepared statement for a SQLite3 delete query
-     *
-     * @var SQLite3Stmt
-     */
-    private $deleteQuery;
-
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-     * @return    void
-     * @throws    PHPExcel\Exception
-     */
-    protected function storeData()
-    {
-        if ($this->currentCellIsDirty) {
-            $this->currentObject->detach();
-
-            $this->insertQuery->bindValue('id', $this->currentObjectID, SQLITE3_TEXT);
-            $this->insertQuery->bindValue('data', serialize($this->currentObject), SQLITE3_BLOB);
-            $result = $this->insertQuery->execute();
-            if ($result === false)
-                throw new Exception($this->DBHandle->lastErrorMsg());
-            $this->currentCellIsDirty = false;
-        }
-        $this->currentObjectID = $this->currentObject = null;
-    }
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param    string            $pCoord        Coordinate address of the cell to update
-     * @param    PHPExcel\Cell    $cell        Cell to update
-     * @return    void
-     * @throws    PHPExcel\Exception
-     */
-    public function addCacheData($pCoord, Cell $cell)
-    {
-        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
-            $this->storeData();
-        }
-
-        $this->currentObjectID = $pCoord;
-        $this->currentObject = $cell;
-        $this->currentCellIsDirty = true;
-
-        return $cell;
-    }
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param     string             $pCoord        Coordinate of the cell
-     * @throws     PHPExcel\Exception
-     * @return     PHPExcel\Cell     Cell that was found, or null if not found
-     */
-    public function getCacheData($pCoord)
-    {
-        if ($pCoord === $this->currentObjectID) {
-            return $this->currentObject;
-        }
-        $this->storeData();
-
-        $this->selectQuery->bindValue('id', $pCoord, SQLITE3_TEXT);
-        $cellResult = $this->selectQuery->execute();
-        if ($cellResult === false) {
-            throw new Exception($this->DBHandle->lastErrorMsg());
-        }
-        $cellData = $cellResult->fetchArray(SQLITE3_ASSOC);
-        if ($cellData === false) {
-            //    Return null if requested entry doesn't exist in cache
-            return null;
-        }
-
-        //    Set current entry to the requested entry
-        $this->currentObjectID = $pCoord;
-
-        $this->currentObject = unserialize($cellData['value']);
-        //    Re-attach this as the cell's parent
-        $this->currentObject->attach($this);
-
-        //    Return requested entry
-        return $this->currentObject;
-    }
-
-    /**
-     *    Is a value set for an indexed cell?
-     *
-     * @param    string        $pCoord        Coordinate address of the cell to check
-     * @return    boolean
-     */
-    public function isDataSet($pCoord)
-    {
-        if ($pCoord === $this->currentObjectID) {
-            return true;
-        }
-
-        //    Check if the requested entry exists in the cache
-        $this->selectQuery->bindValue('id', $pCoord, SQLITE3_TEXT);
-        $cellResult = $this->selectQuery->execute();
-        if ($cellResult === false) {
-            throw new Exception($this->DBHandle->lastErrorMsg());
-        }
-        $cellData = $cellResult->fetchArray(SQLITE3_ASSOC);
-
-        return ($cellData === false) ? false : true;
-    }
-
-    /**
-     *    Delete a cell in cache identified by coordinate address
-     *
-     * @param    string            $pCoord        Coordinate address of the cell to delete
-     * @throws    PHPExcel\Exception
-     */
-    public function deleteCacheData($pCoord)
-    {
-        if ($pCoord === $this->currentObjectID) {
-            $this->currentObject->detach();
-            $this->currentObjectID = $this->currentObject = null;
-        }
-
-        //    Check if the requested entry exists in the cache
-        $this->deleteQuery->bindValue('id', $pCoord, SQLITE3_TEXT);
-        $result = $this->deleteQuery->execute();
-        if ($result === false)
-            throw new Exception($this->DBHandle->lastErrorMsg());
-
-        $this->currentCellIsDirty = false;
-    }
-
-    /**
-     * Move a cell object from one address to another
-     *
-     * @param    string        $fromAddress    Current address of the cell to move
-     * @param    string        $toAddress        Destination address of the cell to move
-     * @return    boolean
-     */
-    public function moveCell($fromAddress, $toAddress)
-    {
-        if ($fromAddress === $this->currentObjectID) {
-            $this->currentObjectID = $toAddress;
-        }
-
-        $this->deleteQuery->bindValue('id', $toAddress, SQLITE3_TEXT);
-        $result = $this->deleteQuery->execute();
-        if ($result === false)
-            throw new Exception($this->DBHandle->lastErrorMsg());
-
-        $this->updateQuery->bindValue('toid', $toAddress, SQLITE3_TEXT);
-        $this->updateQuery->bindValue('fromid', $fromAddress, SQLITE3_TEXT);
-        $result = $this->updateQuery->execute();
-        if ($result === false)
-            throw new Exception($this->DBHandle->lastErrorMsg());
-
-        return true;
-    }
-
-    /**
-     * Get a list of all cell addresses currently held in cache
-     *
-     * @return    array of string
-     */
-    public function getCellList()
-    {
-        if ($this->currentObjectID !== null) {
-            $this->storeData();
-        }
-
-        $query = "SELECT id FROM kvp_".$this->TableName;
-        $cellIdsResult = $this->DBHandle->query($query);
-        if ($cellIdsResult === false)
-            throw new Exception($this->DBHandle->lastErrorMsg());
-
-        $cellKeys = array();
-        while ($row = $cellIdsResult->fetchArray(SQLITE3_ASSOC)) {
-            $cellKeys[] = $row['id'];
-        }
-
-        return $cellKeys;
-    }
-
-    /**
-     * Clone the cell collection
-     *
-     * @param    PHPExcel\Worksheet    $parent        The new worksheet
-     * @return    void
-     */
-    public function copyCellCollection(Worksheet $parent)
-    {
-        $this->currentCellIsDirty;
-        $this->storeData();
-
-        //    Get a new id for the new table name
-        $tableName = str_replace('.','_',$this->getUniqueID());
-        if (!$this->DBHandle->exec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
-                                               AS SELECT * FROM kvp_'.$this->TableName))
-            throw new Exception($this->DBHandle->lastErrorMsg());
-
-        //    Copy the existing cell cache file
-        $this->TableName = $tableName;
-    }
-
-    /**
-     * Clear the cell collection and disconnect from our parent
-     *
-     * @return    void
-     */
-    public function unsetWorksheetCells()
-    {
-        if(!is_null($this->currentObject)) {
-            $this->currentObject->detach();
-            $this->currentObject = $this->currentObjectID = null;
-        }
-        //    detach ourself from the worksheet, so that it can then delete this object successfully
-        $this->parent = null;
-
-        //    Close down the temporary cache file
-        $this->__destruct();
-    }
-
-    /**
-     * Initialise this new cell collection
-     *
-     * @param    PHPExcel\Worksheet    $parent        The worksheet for this cell collection
-     */
-    public function __construct(Worksheet $parent)
-    {
-        parent::__construct($parent);
-        if (is_null($this->DBHandle)) {
-            $this->TableName = str_replace('.', '_', $this->getUniqueID());
-            $DBName = ':memory:';
-
-            $this->DBHandle = new SQLite3($DBName);
-            if ($this->DBHandle === false)
-                throw new Exception($this->DBHandle->lastErrorMsg());
-            if (!$this->DBHandle->exec('CREATE TABLE kvp_'.$this->TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
-                throw new Exception($this->DBHandle->lastErrorMsg());
-        }
-
-        $this->selectQuery = $this->DBHandle->prepare("SELECT value FROM kvp_".$this->TableName." WHERE id = :id");
-        $this->insertQuery = $this->DBHandle->prepare("INSERT OR REPLACE INTO kvp_".$this->TableName." VALUES(:id,:data)");
-        $this->updateQuery = $this->DBHandle->prepare("UPDATE kvp_".$this->TableName." SET id=:toId WHERE id=:fromId");
-        $this->deleteQuery = $this->DBHandle->prepare("DELETE FROM kvp_".$this->TableName." WHERE id = :id");
-    }
-
-    /**
-     * Destroy this cell collection
-     */
-    public function __destruct()
-    {
-        if (!is_null($this->DBHandle)) {
-            $this->DBHandle->exec('DROP TABLE kvp_'.$this->TableName);
-            $this->DBHandle->close();
-        }
-        $this->DBHandle = null;
-    }
-
-
-    /**
-     * Identify whether the caching method is currently available
-     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-     *
-     * @return    boolean
-     */
-    public static function cacheMethodIsAvailable()
-    {
-        return class_exists('SQLite3', false);
-    }
-}
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2013 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+namespace PHPExcel;
+
+/**
+ * PHPExcel\CachedObjectStorage_SQLite3
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class CachedObjectStorage_SQLite3 extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
+{
+    /**
+     * Database table name
+     *
+     * @var string
+     */
+    private $TableName = null;
+
+    /**
+     * Database handle
+     *
+     * @var resource
+     */
+    private $DBHandle = null;
+
+    /**
+     * Prepared statement for a SQLite3 select query
+     *
+     * @var SQLite3Stmt
+     */
+    private $selectQuery;
+
+    /**
+     * Prepared statement for a SQLite3 insert query
+     *
+     * @var SQLite3Stmt
+     */
+    private $insertQuery;
+
+    /**
+     * Prepared statement for a SQLite3 update query
+     *
+     * @var SQLite3Stmt
+     */
+    private $updateQuery;
+
+    /**
+     * Prepared statement for a SQLite3 delete query
+     *
+     * @var SQLite3Stmt
+     */
+    private $deleteQuery;
+
+
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+     * @return    void
+     * @throws    PHPExcel\Exception
+     */
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty) {
+            $this->currentObject->detach();
+
+            $this->insertQuery->bindValue('id', $this->currentObjectID, SQLITE3_TEXT);
+            $this->insertQuery->bindValue('data', serialize($this->currentObject), SQLITE3_BLOB);
+            $result = $this->insertQuery->execute();
+            if (!$result) {
+                throw new Exception($this->DBHandle->lastErrorMsg());
+            }
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
+    }
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel\Cell    $cell        Cell to update
+     * @return    void
+     * @throws    PHPExcel\Exception
+     */
+    public function addCacheData($pCoord, Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param     string             $pCoord        Coordinate of the cell
+     * @throws     PHPExcel\Exception
+     * @return     PHPExcel\Cell     Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
+        }
+        $this->storeData();
+
+        $this->selectQuery->bindValue('id', $pCoord, SQLITE3_TEXT);
+        $cellResult = $this->selectQuery->execute();
+        if ($cellResult === false) {
+            throw new Exception($this->DBHandle->lastErrorMsg());
+        }
+        $cellData = $cellResult->fetchArray(SQLITE3_ASSOC);
+        if ($cellData === false) {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+
+        $this->currentObject = unserialize($cellData['value']);
+        //    Re-attach this as the cell's parent
+        $this->currentObject->attach($this);
+
+        //    Return requested entry
+        return $this->currentObject;
+    }
+
+    /**
+     *    Is a value set for an indexed cell?
+     *
+     * @param    string        $pCoord        Coordinate address of the cell to check
+     * @return    boolean
+     */
+    public function isDataSet($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return true;
+        }
+
+        //    Check if the requested entry exists in the cache
+        $this->selectQuery->bindValue('id', $pCoord, SQLITE3_TEXT);
+        $cellResult = $this->selectQuery->execute();
+        if ($cellResult === false) {
+            throw new Exception($this->DBHandle->lastErrorMsg());
+        }
+        $cellData = $cellResult->fetchArray(SQLITE3_ASSOC);
+
+        return ($cellData === false) ? false : true;
+    }
+
+    /**
+     *    Delete a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to delete
+     * @throws    PHPExcel\Exception
+     */
+    public function deleteCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            $this->currentObject->detach();
+            $this->currentObjectID = $this->currentObject = null;
+        }
+
+        //    Check if the requested entry exists in the cache
+        $this->deleteQuery->bindValue('id', $pCoord, SQLITE3_TEXT);
+        $result = $this->deleteQuery->execute();
+        if (!$result) {
+            throw new Exception($this->DBHandle->lastErrorMsg());
+        }
+
+        $this->currentCellIsDirty = false;
+    }
+
+    /**
+     * Move a cell object from one address to another
+     *
+     * @param    string        $fromAddress    Current address of the cell to move
+     * @param    string        $toAddress        Destination address of the cell to move
+     * @return    boolean
+     */
+    public function moveCell($fromAddress, $toAddress)
+    {
+        if ($fromAddress === $this->currentObjectID) {
+            $this->currentObjectID = $toAddress;
+        }
+
+        $this->deleteQuery->bindValue('id', $toAddress, SQLITE3_TEXT);
+        $result = $this->deleteQuery->execute();
+        if (!$result) {
+            throw new Exception($this->DBHandle->lastErrorMsg());
+        }
+
+        $this->updateQuery->bindValue('toid', $toAddress, SQLITE3_TEXT);
+        $this->updateQuery->bindValue('fromid', $fromAddress, SQLITE3_TEXT);
+        $result = $this->updateQuery->execute();
+        if (!$result) {
+            throw new Exception($this->DBHandle->lastErrorMsg());
+        }
+
+        return true;
+    }
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return    array of string
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
+
+        $query = "SELECT id FROM kvp_".$this->TableName;
+        $cellIdsResult = $this->DBHandle->query($query);
+        if ($cellIdsResult === false)
+            throw new Exception($this->DBHandle->lastErrorMsg());
+
+        $cellKeys = array();
+        while ($row = $cellIdsResult->fetchArray(SQLITE3_ASSOC)) {
+            $cellKeys[] = $row['id'];
+        }
+
+        return $cellKeys;
+    }
+
+    /**
+     * Clone the cell collection
+     *
+     * @param    PHPExcel\Worksheet    $parent        The new worksheet
+     * @return    void
+     */
+    public function copyCellCollection(Worksheet $parent)
+    {
+        $this->currentCellIsDirty;
+        $this->storeData();
+
+        //    Get a new id for the new table name
+        $tableName = str_replace('.', '_', $this->getUniqueID());
+        if (!$this->DBHandle->exec(
+            'CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
+                AS SELECT * FROM kvp_'.$this->TableName
+        )) {
+            throw new Exception($this->DBHandle->lastErrorMsg());
+        }
+
+        //    Copy the existing cell cache file
+        $this->TableName = $tableName;
+    }
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     * @return    void
+     */
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+
+        //    Close down the temporary cache file
+        $this->__destruct();
+    }
+
+    /**
+     * Initialise this new cell collection
+     *
+     * @param    PHPExcel\Worksheet    $parent        The worksheet for this cell collection
+     */
+    public function __construct(Worksheet $parent)
+    {
+        parent::__construct($parent);
+        if (is_null($this->DBHandle)) {
+            $this->TableName = str_replace('.', '_', $this->getUniqueID());
+            $DBName = ':memory:';
+
+            $this->DBHandle = new SQLite3($DBName);
+            if (!$this->DBHandle) {
+                throw new Exception($this->DBHandle->lastErrorMsg());
+            }
+            $query = 'CREATE TABLE kvp_'.$this->TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)';
+            if (!$this->DBHandle->exec($query)) {
+                throw new Exception($this->DBHandle->lastErrorMsg());
+            }
+        }
+
+        $this->selectQuery = $this->DBHandle->prepare(
+            "SELECT value FROM kvp_".$this->TableName." WHERE id = :id"
+        );
+        $this->insertQuery = $this->DBHandle->prepare(
+            "INSERT OR REPLACE INTO kvp_".$this->TableName." VALUES(:id,:data)"
+        );
+        $this->updateQuery = $this->DBHandle->prepare(
+            "UPDATE kvp_".$this->TableName." SET id=:toId WHERE id=:fromId"
+        );
+        $this->deleteQuery = $this->DBHandle->prepare(
+            "DELETE FROM kvp_".$this->TableName." WHERE id = :id"
+        );
+    }
+
+    /**
+     * Destroy this cell collection
+     */
+    public function __destruct()
+    {
+        if (!is_null($this->DBHandle)) {
+            $this->DBHandle->exec('DROP TABLE kvp_'.$this->TableName);
+            $this->DBHandle->close();
+        }
+        $this->DBHandle = null;
+    }
+
+
+    /**
+     * Identify whether the caching method is currently available
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+     *
+     * @return    boolean
+     */
+    public static function cacheMethodIsAvailable()
+    {
+        return class_exists('SQLite3', false);
+    }
+}
diff --git a/Classes/PHPExcel/CachedObjectStorage/Wincache.php b/Classes/PHPExcel/CachedObjectStorage/Wincache.php
index ddb6e46..c1a17a2 100644
--- a/Classes/PHPExcel/CachedObjectStorage/Wincache.php
+++ b/Classes/PHPExcel/CachedObjectStorage/Wincache.php
@@ -1,292 +1,292 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2013 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-namespace PHPExcel;
-
-/**
- * PHPExcel\CachedObjectStorage_Wincache
- *
- * @category   PHPExcel
- * @package    PHPExcel\CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class CachedObjectStorage_Wincache extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
-{
-    /**
-     * Prefix used to uniquely identify cache data for this worksheet
-     *
-     * @var string
-     */
-    private $cachePrefix = null;
-
-    /**
-     * Cache timeout
-     *
-     * @var integer
-     */
-    private $cacheTime = 600;
-
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-     * @return    void
-     * @throws    PHPExcel\Exception
-     */
-    protected function _storeData()
-    {
-        if ($this->currentCellIsDirty) {
-            $this->currentObject->detach();
-
-            $obj = serialize($this->currentObject);
-            if (wincache_ucache_exists($this->cachePrefix.$this->currentObjectID.'.cache')) {
-                if (!wincache_ucache_set($this->cachePrefix.$this->currentObjectID.'.cache', $obj, $this->cacheTime)) {
-                    $this->__destruct();
-                    throw new Exception('Failed to store cell '.$this->currentObjectID.' in WinCache');
-                }
-            } else {
-                if (!wincache_ucache_add($this->cachePrefix.$this->currentObjectID.'.cache', $obj, $this->cacheTime)) {
-                    $this->__destruct();
-                    throw new Exception('Failed to store cell '.$this->currentObjectID.' in WinCache');
-                }
-            }
-            $this->currentCellIsDirty = false;
-        }
-
-        $this->currentObjectID = $this->currentObject = null;
-    }
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param    string            $pCoord        Coordinate address of the cell to update
-     * @param    PHPExcel\Cell    $cell        Cell to update
-     * @return    void
-     * @throws    PHPExcel\Exception
-     */
-    public function addCacheData($pCoord, Cell $cell)
-    {
-        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
-            $this->storeData();
-        }
-        $this->cellCache[$pCoord] = true;
-
-        $this->currentObjectID = $pCoord;
-        $this->currentObject = $cell;
-        $this->currentCellIsDirty = true;
-
-        return $cell;
-    }
-
-    /**
-     * Is a value set in the current PHPExcel\CachedObjectStorage_ICache for an indexed cell?
-     *
-     * @param    string        $pCoord        Coordinate address of the cell to check
-     * @return    boolean
-     */
-    public function isDataSet($pCoord)
-    {
-        //    Check if the requested entry is the current object, or exists in the cache
-        if (parent::isDataSet($pCoord)) {
-            if ($this->currentObjectID == $pCoord) {
-                return true;
-            }
-            //    Check if the requested entry still exists in cache
-            $success = wincache_ucache_exists($this->cachePrefix.$pCoord.'.cache');
-            if ($success === false) {
-                //    Entry no longer exists in Wincache, so clear it from the cache array
-                parent::deleteCacheData($pCoord);
-                throw new Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
-            }
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param    string            $pCoord        Coordinate of the cell
-     * @throws    PHPExcel\Exception
-     * @return    PHPExcel\Cell    Cell that was found, or null if not found
-     */
-    public function getCacheData($pCoord)
-    {
-        if ($pCoord === $this->currentObjectID) {
-            return $this->currentObject;
-        }
-        $this->storeData();
-
-        //    Check if the entry that has been requested actually exists
-        $obj = null;
-        if (parent::isDataSet($pCoord)) {
-            $success = false;
-            $obj = wincache_ucache_get($this->cachePrefix.$pCoord.'.cache', $success);
-            if ($success === false) {
-                //    Entry no longer exists in WinCache, so clear it from the cache array
-                parent::deleteCacheData($pCoord);
-                throw new Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
-            }
-        } else {
-            //    Return null if requested entry doesn't exist in cache
-            return null;
-        }
-
-        //    Set current entry to the requested entry
-        $this->currentObjectID = $pCoord;
-        $this->currentObject = unserialize($obj);
-        //    Re-attach this as the cell's parent
-        $this->currentObject->attach($this);
-
-        //    Return requested entry
-        return $this->currentObject;
-    }
-
-    /**
-     * Get a list of all cell addresses currently held in cache
-     *
-     * @return  array of string
-     */
-    public function getCellList()
-    {
-        if ($this->currentObjectID !== null) {
-            $this->storeData();
-        }
-
-        return parent::getCellList();
-    }
-
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @param    string            $pCoord        Coordinate address of the cell to delete
-     * @throws    PHPExcel\Exception
-     */
-    public function deleteCacheData($pCoord)
-    {
-        //    Delete the entry from Wincache
-        wincache_ucache_delete($this->cachePrefix.$pCoord.'.cache');
-
-        //    Delete the entry from our cell address array
-        parent::deleteCacheData($pCoord);
-    }
-
-    /**
-     * Clone the cell collection
-     *
-     * @param    PHPExcel\Worksheet    $parent        The new worksheet
-     * @return    void
-     */
-    public function copyCellCollection(Worksheet $parent)
-    {
-        parent::copyCellCollection($parent);
-        //    Get a new id for the new file name
-        $baseUnique = $this->getUniqueID();
-        $newCachePrefix = substr(md5($baseUnique), 0, 8).'.';
-        $cacheList = $this->getCellList();
-        foreach($cacheList as $cellID) {
-            if ($cellID != $this->currentObjectID) {
-                $success = false;
-                $obj = wincache_ucache_get($this->cachePrefix.$cellID.'.cache', $success);
-                if ($success === false) {
-                    //    Entry no longer exists in WinCache, so clear it from the cache array
-                    parent::deleteCacheData($cellID);
-                    throw new Exception('Cell entry '.$cellID.' no longer exists in Wincache');
-                }
-                if (!wincache_ucache_add($newCachePrefix.$cellID.'.cache', $obj, $this->cacheTime)) {
-                    $this->__destruct();
-                    throw new Exception('Failed to store cell '.$cellID.' in Wincache');
-                }
-            }
-        }
-        $this->cachePrefix = $newCachePrefix;
-    }
-
-    /**
-     * Clear the cell collection and disconnect from our parent
-     *
-     * @return    void
-     */
-    public function unsetWorksheetCells()
-    {
-        if(!is_null($this->currentObject)) {
-            $this->currentObject->detach();
-            $this->currentObject = $this->currentObjectID = null;
-        }
-
-        //    Flush the WinCache cache
-        $this->__destruct();
-
-        $this->cellCache = array();
-
-        //    detach ourself from the worksheet, so that it can then delete this object successfully
-        $this->parent = null;
-    }
-
-    /**
-     * Initialise this new cell collection
-     *
-     * @param    PHPExcel\Worksheet    $parent        The worksheet for this cell collection
-     * @param    array of mixed        $arguments    Additional initialisation arguments
-     */
-    public function __construct(Worksheet $parent, $arguments)
-    {
-        $cacheTime = (isset($arguments['cacheTime'])) ? $arguments['cacheTime'] : 600;
-
-        if (is_null($this->cachePrefix)) {
-            $baseUnique = $this->getUniqueID();
-            $this->cachePrefix = substr(md5($baseUnique), 0, 8).'.';
-            $this->cacheTime = $cacheTime;
-
-            parent::__construct($parent);
-        }
-    }
-
-    /**
-     * Destroy this cell collection
-     */
-    public function __destruct()
-    {
-        $cacheList = $this->getCellList();
-        foreach($cacheList as $cellID) {
-            wincache_ucache_delete($this->cachePrefix.$cellID.'.cache');
-        }
-    }
-
-    /**
-     * Identify whether the caching method is currently available
-     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-     *
-     * @return    boolean
-     */
-    public static function cacheMethodIsAvailable()
-    {
-        return function_exists('wincache_ucache_add');
-    }
-}
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2013 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+
+namespace PHPExcel;
+
+/**
+ * PHPExcel\CachedObjectStorage_Wincache
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel\CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class CachedObjectStorage_Wincache extends CachedObjectStorage_CacheBase implements CachedObjectStorage_ICache
+{
+    /**
+     * Prefix used to uniquely identify cache data for this worksheet
+     *
+     * @var string
+     */
+    private $cachePrefix = null;
+
+    /**
+     * Cache timeout
+     *
+     * @var integer
+     */
+    private $cacheTime = 600;
+
+
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+     * @return    void
+     * @throws    PHPExcel\Exception
+     */
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty) {
+            $this->currentObject->detach();
+
+            $obj = serialize($this->currentObject);
+            if (wincache_ucache_exists($this->cachePrefix.$this->currentObjectID.'.cache')) {
+                if (!wincache_ucache_set($this->cachePrefix.$this->currentObjectID.'.cache', $obj, $this->cacheTime)) {
+                    $this->__destruct();
+                    throw new Exception('Failed to store cell '.$this->currentObjectID.' in WinCache');
+                }
+            } else {
+                if (!wincache_ucache_add($this->cachePrefix.$this->currentObjectID.'.cache', $obj, $this->cacheTime)) {
+                    $this->__destruct();
+                    throw new Exception('Failed to store cell '.$this->currentObjectID.' in WinCache');
+                }
+            }
+            $this->currentCellIsDirty = false;
+        }
+
+        $this->currentObjectID = $this->currentObject = null;
+    }
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to update
+     * @param    PHPExcel\Cell    $cell        Cell to update
+     * @return    void
+     * @throws    PHPExcel\Exception
+     */
+    public function addCacheData($pCoord, Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+        $this->cellCache[$pCoord] = true;
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }
+
+    /**
+     * Is a value set in the current PHPExcel\CachedObjectStorage_ICache for an indexed cell?
+     *
+     * @param    string        $pCoord        Coordinate address of the cell to check
+     * @return    boolean
+     */
+    public function isDataSet($pCoord)
+    {
+        //    Check if the requested entry is the current object, or exists in the cache
+        if (parent::isDataSet($pCoord)) {
+            if ($this->currentObjectID == $pCoord) {
+                return true;
+            }
+            //    Check if the requested entry still exists in cache
+            $success = wincache_ucache_exists($this->cachePrefix.$pCoord.'.cache');
+            if ($success === false) {
+                //    Entry no longer exists in Wincache, so clear it from the cache array
+                parent::deleteCacheData($pCoord);
+                throw new Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param    string            $pCoord        Coordinate of the cell
+     * @throws    PHPExcel\Exception
+     * @return    PHPExcel\Cell    Cell that was found, or null if not found
+     */
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
+        }
+        $this->storeData();
+
+        //    Check if the entry that has been requested actually exists
+        $obj = null;
+        if (parent::isDataSet($pCoord)) {
+            $success = false;
+            $obj = wincache_ucache_get($this->cachePrefix.$pCoord.'.cache', $success);
+            if ($success === false) {
+                //    Entry no longer exists in WinCache, so clear it from the cache array
+                parent::deleteCacheData($pCoord);
+                throw new Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
+            }
+        } else {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
+
+        //    Set current entry to the requested entry
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = unserialize($obj);
+        //    Re-attach this as the cell's parent
+        $this->currentObject->attach($this);
+
+        //    Return requested entry
+        return $this->currentObject;
+    }
+
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  array of string
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
+
+        return parent::getCellList();
+    }
+
+    /**
+     * Delete a cell in cache identified by coordinate address
+     *
+     * @param    string            $pCoord        Coordinate address of the cell to delete
+     * @throws    PHPExcel\Exception
+     */
+    public function deleteCacheData($pCoord)
+    {
+        //    Delete the entry from Wincache
+        wincache_ucache_delete($this->cachePrefix.$pCoord.'.cache');
+
+        //    Delete the entry from our cell address array
+        parent::deleteCacheData($pCoord);
+    }
+
+    /**
+     * Clone the cell collection
+     *
+     * @param    PHPExcel\Worksheet    $parent        The new worksheet
+     * @return    void
+     */
+    public function copyCellCollection(Worksheet $parent)
+    {
+        parent::copyCellCollection($parent);
+        //    Get a new id for the new file name
+        $baseUnique = $this->getUniqueID();
+        $newCachePrefix = substr(md5($baseUnique), 0, 8).'.';
+        $cacheList = $this->getCellList();
+        foreach ($cacheList as $cellID) {
+            if ($cellID != $this->currentObjectID) {
+                $success = false;
+                $obj = wincache_ucache_get($this->cachePrefix.$cellID.'.cache', $success);
+                if (!$success) {
+                    //    Entry no longer exists in WinCache, so clear it from the cache array
+                    parent::deleteCacheData($cellID);
+                    throw new Exception('Cell entry '.$cellID.' no longer exists in Wincache');
+                }
+                if (!wincache_ucache_add($newCachePrefix.$cellID.'.cache', $obj, $this->cacheTime)) {
+                    $this->__destruct();
+                    throw new Exception('Failed to store cell '.$cellID.' in Wincache');
+                }
+            }
+        }
+        $this->cachePrefix = $newCachePrefix;
+    }
+
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     * @return    void
+     */
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+
+        //    Flush the WinCache cache
+        $this->__destruct();
+
+        $this->cellCache = array();
+
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
+    }
+
+    /**
+     * Initialise this new cell collection
+     *
+     * @param    PHPExcel\Worksheet    $parent        The worksheet for this cell collection
+     * @param    array of mixed        $arguments    Additional initialisation arguments
+     */
+    public function __construct(Worksheet $parent, $arguments)
+    {
+        $cacheTime = (isset($arguments['cacheTime'])) ? $arguments['cacheTime'] : 600;
+
+        if (is_null($this->cachePrefix)) {
+            $baseUnique = $this->getUniqueID();
+            $this->cachePrefix = substr(md5($baseUnique), 0, 8).'.';
+            $this->cacheTime = $cacheTime;
+
+            parent::__construct($parent);
+        }
+    }
+
+    /**
+     * Destroy this cell collection
+     */
+    public function __destruct()
+    {
+        $cacheList = $this->getCellList();
+        foreach ($cacheList as $cellID) {
+            wincache_ucache_delete($this->cachePrefix.$cellID.'.cache');
+        }
+    }
+
+    /**
+     * Identify whether the caching method is currently available
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+     *
+     * @return    boolean
+     */
+    public static function cacheMethodIsAvailable()
+    {
+        return function_exists('wincache_ucache_add');
+    }
+}
diff --git a/Classes/PHPExcel/CalcEngine/CyclicReferenceStack.php b/Classes/PHPExcel/CalcEngine/CyclicReferenceStack.php
index 8a4467b..ce8d297 100644
--- a/Classes/PHPExcel/CalcEngine/CyclicReferenceStack.php
+++ b/Classes/PHPExcel/CalcEngine/CyclicReferenceStack.php
@@ -35,7 +35,8 @@ namespace PHPExcel;
  * @package        PHPExcel\Calculation
  * @copyright    Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
-class CalcEngine_CyclicReferenceStack {
+class CalcEngine_CyclicReferenceStack
+{
 
     /**
      *  The call stack for calculated cells
@@ -50,7 +51,8 @@ class CalcEngine_CyclicReferenceStack {
      *
      * @return  integer
      */
-    public function count() {
+    public function count()
+    {
         return count($this->stack);
     }
 
@@ -59,7 +61,8 @@ class CalcEngine_CyclicReferenceStack {
      *
      * @param  mixed  $value
      */
-    public function push($value) {
+    public function push($value)
+    {
         $this->stack[] = $value;
     }    //    function push()
 
@@ -68,7 +71,8 @@ class CalcEngine_CyclicReferenceStack {
      *
      * @return  mixed
      */
-    public function pop() {
+    public function pop()
+    {
         return array_pop($this->stack);
     }    //    function pop()
 
@@ -77,14 +81,16 @@ class CalcEngine_CyclicReferenceStack {
      *
      * @param  mixed  $value  The value to test
      */
-    public function onStack($value) {
+    public function onStack($value)
+    {
         return in_array($value, $this->stack);
     }
 
     /**
      * Clear the stack
      */
-    public function clear() {
+    public function clear()
+    {
         $this->stack = array();
     }    //    function push()
 
@@ -93,7 +99,8 @@ class CalcEngine_CyclicReferenceStack {
      *
      * @return  mixed[]
      */
-    public function showStack() {
+    public function showStack()
+    {
         return $this->stack;
     }
 }
diff --git a/Classes/PHPExcel/CalcEngine/Logger.php b/Classes/PHPExcel/CalcEngine/Logger.php
index d66b2f2..01b6848 100644
--- a/Classes/PHPExcel/CalcEngine/Logger.php
+++ b/Classes/PHPExcel/CalcEngine/Logger.php
@@ -34,8 +34,8 @@ namespace PHPExcel;
  * @package        PHPExcel\Calculation
  * @copyright    Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
-class CalcEngine_Logger {
-
+class CalcEngine_Logger
+{
     /**
      * Flag to determine whether a debug log should be generated by the calculation engine
      *        If true, then a debug log will be generated
@@ -43,7 +43,7 @@ class CalcEngine_Logger {
      *
      * @var boolean
      */
-    private $_writeDebugLog = false;
+    private $writeDebugLog = false;
 
     /**
      * Flag to determine whether a debug log should be echoed by the calculation engine
@@ -53,21 +53,21 @@ class CalcEngine_Logger {
      *
      * @var boolean
      */
-    private $_echoDebugLog = false;
+    private $echoDebugLog = false;
 
     /**
      * The debug log generated by the calculation engine
      *
      * @var string[]
      */
-    private $_debugLog = array();
+    private $debugLog = array();
 
     /**
      * The calculation engine cell reference stack
      *
      * @var PHPExcel\CalcEngine_CyclicReferenceStack
      */
-    private $_cellStack;
+    private $cellStack;
 
 
     /**
@@ -75,8 +75,9 @@ class CalcEngine_Logger {
      *
      * @param  PHPExcel\CalcEngine_CyclicReferenceStack $stack
      */
-    public function __construct(CalcEngine_CyclicReferenceStack $stack) {
-        $this->_cellStack = $stack;
+    public function __construct(CalcEngine_CyclicReferenceStack $stack)
+    {
+        $this->cellStack = $stack;
     }
 
     /**
@@ -84,8 +85,9 @@ class CalcEngine_Logger {
      *
      * @param  boolean $pValue
      */
-    public function setWriteDebugLog($pValue = false) {
-        $this->_writeDebugLog = $pValue;
+    public function setWriteDebugLog($pValue = false)
+    {
+        $this->writeDebugLog = $pValue;
     }
 
     /**
@@ -93,8 +95,9 @@ class CalcEngine_Logger {
      *
      * @return  boolean
      */
-    public function getWriteDebugLog() {
-        return $this->_writeDebugLog;
+    public function getWriteDebugLog()
+    {
+        return $this->writeDebugLog;
     }
 
     /**
@@ -102,8 +105,9 @@ class CalcEngine_Logger {
      *
      * @param  boolean $pValue
      */
-    public function setEchoDebugLog($pValue = false) {
-        $this->_echoDebugLog = $pValue;
+    public function setEchoDebugLog($pValue = false)
+    {
+        $this->echoDebugLog = $pValue;
     }
 
     /**
@@ -111,26 +115,28 @@ class CalcEngine_Logger {
      *
      * @return  boolean
      */
-    public function getEchoDebugLog() {
-        return $this->_echoDebugLog;
+    public function getEchoDebugLog()
+    {
+        return $this->echoDebugLog;
     }
 
     /**
      * Write an entry to the calculation engine debug log
      */
-    public function writeDebugLog() {
+    public function writeDebugLog()
+    {
         //    Only write the debug log if logging is enabled
-        if ($this->_writeDebugLog) {
+        if ($this->writeDebugLog) {
             $message = implode(func_get_args());
-            $cellReference = implode(' -> ', $this->_cellStack->showStack());
-            if ($this->_echoDebugLog) {
+            $cellReference = implode(' -> ', $this->cellStack->showStack());
+            if ($this->echoDebugLog) {
                 echo $cellReference,
-                    ($this->_cellStack->count() > 0 ? ' => ' : ''),
+                    ($this->cellStack->count() > 0 ? ' => ' : ''),
                     $message,
                     PHP_EOL;
             }
-            $this->_debugLog[] = $cellReference .
-                ($this->_cellStack->count() > 0 ? ' => ' : '') .
+            $this->debugLog[] = $cellReference .
+                ($this->cellStack->count() > 0 ? ' => ' : '') .
                 $message;
         }
     }
@@ -138,8 +144,9 @@ class CalcEngine_Logger {
     /**
      * Clear the calculation engine debug log
      */
-    public function clearLog() {
-        $this->_debugLog = array();
+    public function clearLog()
+    {
+        $this->debugLog = array();
     }
 
     /**
@@ -147,7 +154,8 @@ class CalcEngine_Logger {
      *
      * @return  string[]
      */
-    public function getLog() {
-        return $this->_debugLog;
+    public function getLog()
+    {
+        return $this->debugLog;
     }
 }
diff --git a/Classes/PHPExcel/Calculation/Exception.php b/Classes/PHPExcel/Calculation/Exception.php
index 76e57c8..c33bccc 100644
--- a/Classes/PHPExcel/Calculation/Exception.php
+++ b/Classes/PHPExcel/Calculation/Exception.php
@@ -33,7 +33,8 @@
  * @package    PHPExcel\Calculation
  * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
-class Calculation_Exception extends Exception {
+class Calculation_Exception extends Exception
+{
     /**
      * Error handler callback
      *
@@ -43,7 +44,8 @@ class Calculation_Exception extends Exception {
      * @param mixed $line
      * @param mixed $context
      */
-    public static function errorHandlerCallback($code, $string, $file, $line, $context) {
+    public static function errorHandlerCallback($code, $string, $file, $line, $context)
+    {
         $e = new self($string, $code);
         $e->line = $line;
         $e->file = $file;
diff --git a/Classes/PHPExcel/Exception.php b/Classes/PHPExcel/Exception.php
index 7481afe..2208ed1 100644
--- a/Classes/PHPExcel/Exception.php
+++ b/Classes/PHPExcel/Exception.php
@@ -35,7 +35,8 @@ namespace PHPExcel;
  * @package    PHPExcel
  * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
-class Exception extends \Exception {
+class Exception extends \Exception
+{
     /**
      * Error handler callback
      *
@@ -45,7 +46,8 @@ class Exception extends \Exception {
      * @param mixed $line
      * @param mixed $context
      */
-    public static function errorHandlerCallback($code, $string, $file, $line, $context) {
+    public static function errorHandlerCallback($code, $string, $file, $line, $context)
+    {
         $e = new self($string, $code);
         $e->line = $line;
         $e->file = $file;
diff --git a/Classes/PHPExcel/HashTable.php b/Classes/PHPExcel/HashTable.php
index 0526a10..b1ce095 100644
--- a/Classes/PHPExcel/HashTable.php
+++ b/Classes/PHPExcel/HashTable.php
@@ -42,14 +42,14 @@ class HashTable
      *
      * @var array
      */
-    public $_items = array();
+    public $items = array();
 
     /**
      * HashTable key map
      *
      * @var array
      */
-    public $_keyMap = array();
+    public $keyMap = array();
 
     /**
      * Create a new PHPExcel\HashTable
@@ -71,7 +71,8 @@ class HashTable
      * @param    PHPExcel\IComparable[] $pSource    Source array to create HashTable from
      * @throws    PHPExcel\Exception
      */
-    public function addFromSource($pSource = null) {
+    public function addFromSource($pSource = null)
+    {
         // Check if an array was passed
         if ($pSource == null) {
             return;
@@ -90,11 +91,12 @@ class HashTable
      * @param    PHPExcel\IComparable $pSource    Item to add
      * @throws    PHPExcel\Exception
      */
-    public function add(IComparable $pSource = null) {
+    public function add(IComparable $pSource = null)
+    {
         $hash = $pSource->getHashCode();
         if (!isset($this->_items[$hash])) {
-            $this->_items[$hash] = $pSource;
-            $this->_keyMap[count($this->_items) - 1] = $hash;
+            $this->items[$hash] = $pSource;
+            $this->keyMap[count($this->items) - 1] = $hash;
         }
     }
 
@@ -104,22 +106,23 @@ class HashTable
      * @param    PHPExcel\IComparable $pSource    Item to remove
      * @throws    PHPExcel\Exception
      */
-    public function remove(IComparable $pSource = null) {
+    public function remove(IComparable $pSource = null)
+    {
         $hash = $pSource->getHashCode();
-        if (isset($this->_items[$hash])) {
-            unset($this->_items[$hash]);
+        if (isset($this->items[$hash])) {
+            unset($this->items[$hash]);
 
             $deleteKey = -1;
-            foreach ($this->_keyMap as $key => $value) {
+            foreach ($this->keyMap as $key => $value) {
                 if ($deleteKey >= 0) {
-                    $this->_keyMap[$key - 1] = $value;
+                    $this->keyMap[$key - 1] = $value;
                 }
 
                 if ($value == $hash) {
                     $deleteKey = $key;
                 }
             }
-            unset($this->_keyMap[count($this->_keyMap) - 1]);
+            unset($this->keyMap[count($this->keyMap) - 1]);
         }
     }
 
@@ -127,9 +130,10 @@ class HashTable
      * Clear HashTable
      *
      */
-    public function clear() {
-        $this->_items = array();
-        $this->_keyMap = array();
+    public function clear()
+    {
+        $this->items = array();
+        $this->keyMap = array();
     }
 
     /**
@@ -137,8 +141,9 @@ class HashTable
      *
      * @return int
      */
-    public function count() {
-        return count($this->_items);
+    public function count()
+    {
+        return count($this->items);
     }
 
     /**
@@ -147,8 +152,9 @@ class HashTable
      * @param    string    $pHashCode
      * @return    int    Index
      */
-    public function getIndexForHashCode($pHashCode = '') {
-        return array_search($pHashCode, $this->_keyMap);
+    public function getIndexForHashCode($pHashCode = '')
+    {
+        return array_search($pHashCode, $this->keyMap);
     }
 
     /**
@@ -158,9 +164,10 @@ class HashTable
      * @return    PHPExcel\IComparable
      *
      */
-    public function getByIndex($pIndex = 0) {
-        if (isset($this->_keyMap[$pIndex])) {
-            return $this->getByHashCode( $this->_keyMap[$pIndex] );
+    public function getByIndex($pIndex = 0)
+    {
+        if (isset($this->keyMap[$pIndex])) {
+            return $this->getByHashCode( $this->keyMap[$pIndex] );
         }
 
         return null;
@@ -173,9 +180,10 @@ class HashTable
      * @return    PHPExcel\IComparable
      *
      */
-    public function getByHashCode($pHashCode = '') {
-        if (isset($this->_items[$pHashCode])) {
-            return $this->_items[$pHashCode];
+    public function getByHashCode($pHashCode = '')
+    {
+        if (isset($this->items[$pHashCode])) {
+            return $this->items[$pHashCode];
         }
 
         return null;
@@ -186,14 +194,16 @@ class HashTable
      *
      * @return PHPExcel\IComparable[]
      */
-    public function toArray() {
-        return $this->_items;
+    public function toArray()
+    {
+        return $this->items;
     }
 
     /**
      * Implement PHP __clone to create a deep clone, not just a shallow copy.
      */
-    public function __clone() {
+    public function __clone()
+    {
         $vars = get_object_vars($this);
         foreach ($vars as $key => $value) {
             if (is_object($value)) {
diff --git a/Classes/PHPExcel/Reader/Exception.php b/Classes/PHPExcel/Reader/Exception.php
index 573fe10..633b415 100644
--- a/Classes/PHPExcel/Reader/Exception.php
+++ b/Classes/PHPExcel/Reader/Exception.php
@@ -35,7 +35,8 @@ namespace PHPExcel;
  * @package    PHPExcel\Reader
  * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
-class Reader_Exception extends Exception {
+class Reader_Exception extends Exception
+{
     /**
      * Error handler callback
      *
@@ -45,7 +46,8 @@ class Reader_Exception extends Exception {
      * @param mixed $line
      * @param mixed $context
      */
-    public static function errorHandlerCallback($code, $string, $file, $line, $context) {
+    public static function errorHandlerCallback($code, $string, $file, $line, $context)
+    {
         $e = new self($string, $code);
         $e->line = $line;
         $e->file = $file;
diff --git a/Classes/PHPExcel/Writer/Exception.php b/Classes/PHPExcel/Writer/Exception.php
index 47dfd28..b37be54 100644
--- a/Classes/PHPExcel/Writer/Exception.php
+++ b/Classes/PHPExcel/Writer/Exception.php
@@ -35,7 +35,8 @@ namespace PHPExcel;
  * @package    PHPExcel\Writer
  * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
-class Writer_Exception extends Exception {
+class Writer_Exception extends Exception
+{
     /**
      * Error handler callback
      *
@@ -45,7 +46,8 @@ class Writer_Exception extends Exception {
      * @param mixed $line
      * @param mixed $context
      */
-    public static function errorHandlerCallback($code, $string, $file, $line, $context) {
+    public static function errorHandlerCallback($code, $string, $file, $line, $context)
+    {
         $e = new self($string, $code);
         $e->line = $line;
         $e->file = $file;
diff --git a/Classes/PHPExcel/Writer/HTML.php b/Classes/PHPExcel/Writer/HTML.php
index aaa2a5a..2c1f377 100644
--- a/Classes/PHPExcel/Writer/HTML.php
+++ b/Classes/PHPExcel/Writer/HTML.php
@@ -35,113 +35,115 @@ namespace PHPExcel;
  * @package    PHPExcel\Writer_HTML
  * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
-class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
+class Writer_HTML extends Writer_Abstract implements Writer_IWriter
+{
     /**
      * PHPExcel object
      *
      * @var PHPExcel
      */
-    protected $_phpExcel;
+    protected $phpExcel;
 
     /**
      * Sheet index to write
      *
      * @var int
      */
-    private $_sheetIndex    = 0;
+    private $sheetIndex    = 0;
 
     /**
      * Images root
      *
      * @var string
      */
-    private $_imagesRoot    = '.';
+    private $imagesRoot    = '.';
 
     /**
      * embed images, or link to images
      *
      * @var boolean
      */
-    private $_embedImages    = false;
+    private $embedImages    = false;
 
     /**
      * Use inline CSS?
      *
      * @var boolean
      */
-    private $_useInlineCss = false;
+    private $useInlineCss = false;
 
     /**
      * Array of CSS styles
      *
      * @var array
      */
-    private $_cssStyles = null;
+    private $cssStyles = null;
 
     /**
      * Array of column widths in points
      *
      * @var array
      */
-    private $_columnWidths = null;
+    private $columnWidths = null;
 
     /**
      * Default font
      *
      * @var PHPExcel\Style_Font
      */
-    private $_defaultFont;
+    private $defaultFont;
 
     /**
      * Flag whether spans have been calculated
      *
      * @var boolean
      */
-    private $_spansAreCalculated    = false;
+    private $spansAreCalculated    = false;
 
     /**
      * Excel cells that should not be written as HTML cells
      *
      * @var array
      */
-    private $_isSpannedCell    = array();
+    private $isSpannedCell    = array();
 
     /**
      * Excel cells that are upper-left corner in a cell merge
      *
      * @var array
      */
-    private $_isBaseCell    = array();
+    private $isBaseCell    = array();
 
     /**
      * Excel rows that should not be written as HTML rows
      *
      * @var array
      */
-    private $_isSpannedRow    = array();
+    private $isSpannedRow    = array();
 
     /**
      * Is the current writer creating PDF?
      *
      * @var boolean
      */
-    protected $_isPdf = false;
+    protected $isPdf = false;
 
     /**
      * Generate the Navigation block
      *
      * @var boolean
      */
-    private $_generateSheetNavigationBlock = true;
+    private $generateSheetNavigationBlock = true;
 
     /**
      * Create a new PHPExcel\Writer_HTML
      *
      * @param    PHPExcel\Workbook    $phpExcel    PHPExcel object
      */
-    public function __construct(Workbook $phpExcel) {
-        $this->_phpExcel = $phpExcel;
-        $this->_defaultFont = $this->_phpExcel->getDefaultStyle()->getFont();
+    public function __construct(Workbook $phpExcel)
+    {
+        $this->phpExcel = $phpExcel;
+        $this->defaultFont = $this->phpExcel->getDefaultStyle()->getFont();
     }
 
     /**
@@ -150,17 +152,18 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @param    string        $pFilename
      * @throws    PHPExcel\Writer_Exception
      */
-    public function save($pFilename = null) {
+    public function save($pFilename = null)
+    {
         // garbage collect
-        $this->_phpExcel->garbageCollect();
+        $this->phpExcel->garbageCollect();
 
-        $saveDebugLog = Calculation::getInstance($this->_phpExcel)->getDebugLog()->getWriteDebugLog();
-        Calculation::getInstance($this->_phpExcel)->getDebugLog()->setWriteDebugLog(false);
+        $saveDebugLog = Calculation::getInstance($this->phpExcel)->getDebugLog()->getWriteDebugLog();
+        Calculation::getInstance($this->phpExcel)->getDebugLog()->setWriteDebugLog(false);
         $saveArrayReturnType = Calculation::getArrayReturnType();
         Calculation::setArrayReturnType(Calculation::RETURN_ARRAY_AS_VALUE);
 
         // Build CSS
-        $this->buildCSS(!$this->_useInlineCss);
+        $this->buildCSS(!$this->useInlineCss);
 
         // Open file
         $fileHandle = fopen($pFilename, 'wb+');
@@ -169,10 +172,10 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
         }
 
         // Write headers
-        fwrite($fileHandle, $this->generateHTMLHeader(!$this->_useInlineCss));
+        fwrite($fileHandle, $this->generateHTMLHeader(!$this->useInlineCss));
 
         // Write navigation (tabs)
-        if ((!$this->_isPdf) && ($this->_generateSheetNavigationBlock)) {
+        if ((!$this->isPdf) && ($this->generateSheetNavigationBlock)) {
             fwrite($fileHandle, $this->generateNavigation());
         }
 
@@ -186,67 +189,73 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
         fclose($fileHandle);
 
         Calculation::setArrayReturnType($saveArrayReturnType);
-        Calculation::getInstance($this->_phpExcel)->getDebugLog()->setWriteDebugLog($saveDebugLog);
+        Calculation::getInstance($this->phpExcel)->getDebugLog()->setWriteDebugLog($saveDebugLog);
     }
 
+    protected static $vAlignmentMap = array(
+        Style_Alignment::VERTICAL_BOTTOM => 'bottom',
+        Style_Alignment::VERTICAL_TOP => 'top',
+        Style_Alignment::VERTICAL_CENTER => 'middle',
+        Style_Alignment::VERTICAL_JUSTIFY => 'middle',
+    );
+
     /**
      * Map VAlign
      *
      * @param    string        $vAlign        Vertical alignment
      * @return string
      */
-    private function _mapVAlign($vAlign) {
-        switch ($vAlign) {
-            case Style_Alignment::VERTICAL_BOTTOM:    return 'bottom';
-            case Style_Alignment::VERTICAL_TOP:        return 'top';
-            case Style_Alignment::VERTICAL_CENTER:
-            case Style_Alignment::VERTICAL_JUSTIFY:    return 'middle';
-            default: return 'baseline';
-        }
+    protected function mapVAlign($vAlign)
+    {
+        return (isset(self::$vAlignmentMap[$vAlign])) ? self::$vAlignmentMap[$vAlign] : 'baseline';
     }
 
+    protected static $hAlignmentMap = array(
+        Style_Alignment::HORIZONTAL_GENERAL => false,
+        Style_Alignment::HORIZONTAL_LEFT => 'left',
+        Style_Alignment::HORIZONTAL_RIGHT => 'right',
+        Style_Alignment::HORIZONTAL_CENTER => 'center',
+        Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS => 'center',
+        Style_Alignment::HORIZONTAL_JUSTIFY => 'justify',
+    );
+
     /**
      * Map HAlign
      *
      * @param    string        $hAlign        Horizontal alignment
      * @return string|false
      */
-    private function _mapHAlign($hAlign) {
-        switch ($hAlign) {
-            case Style_Alignment::HORIZONTAL_GENERAL:            return false;
-            case Style_Alignment::HORIZONTAL_LEFT:                return 'left';
-            case Style_Alignment::HORIZONTAL_RIGHT:                return 'right';
-            case Style_Alignment::HORIZONTAL_CENTER:
-            case Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS:    return 'center';
-            case Style_Alignment::HORIZONTAL_JUSTIFY:            return 'justify';
-            default: return false;
-        }
+    protected function mapHAlign($hAlign)
+    {
+        return (isset(self::$hAlignmentMap[$hAlign])) ? self::$hAlignmentMap[$hAlign] : false;
     }
 
+    protected static $borderStyleMap = array(
+        Style_Border::BORDER_NONE => 'none',
+        Style_Border::BORDER_DASHDOT => '1px dashed',
+        Style_Border::BORDER_DASHDOTDOT => '1px dotted',
+        Style_Border::BORDER_DASHED => '1px dashed',
+        Style_Border::BORDER_DOTTED => '1px dotted',
+        Style_Border::BORDER_DOUBLE => '3px double',
+        Style_Border::BORDER_HAIR => '1px solid',
+        Style_Border::BORDER_MEDIUM => '2px solid',
+        Style_Border::BORDER_MEDIUMDASHDOT => '2px dashed',
+        Style_Border::BORDER_MEDIUMDASHDOTDOT => '2px dotted',
+        Style_Border::BORDER_MEDIUMDASHED => '2px dashed',
+        Style_Border::BORDER_SLANTDASHDOT => '2px dashed',
+        Style_Border::BORDER_THICK => '3px solid',
+        Style_Border::BORDER_THIN => '1px solid',
+    );
+
     /**
      * Map border style
      *
      * @param    int        $borderStyle        Sheet index
      * @return    string
      */
-    private function _mapBorderStyle($borderStyle) {
-        switch ($borderStyle) {
-            case Style_Border::BORDER_NONE:                return 'none';
-            case Style_Border::BORDER_DASHDOT:            return '1px dashed';
-            case Style_Border::BORDER_DASHDOTDOT:        return '1px dotted';
-            case Style_Border::BORDER_DASHED:            return '1px dashed';
-            case Style_Border::BORDER_DOTTED:            return '1px dotted';
-            case Style_Border::BORDER_DOUBLE:            return '3px double';
-            case Style_Border::BORDER_HAIR:                return '1px solid';
-            case Style_Border::BORDER_MEDIUM:            return '2px solid';
-            case Style_Border::BORDER_MEDIUMDASHDOT:    return '2px dashed';
-            case Style_Border::BORDER_MEDIUMDASHDOTDOT:    return '2px dotted';
-            case Style_Border::BORDER_MEDIUMDASHED:        return '2px dashed';
-            case Style_Border::BORDER_SLANTDASHDOT:        return '2px dashed';
-            case Style_Border::BORDER_THICK:            return '3px solid';
-            case Style_Border::BORDER_THIN:                return '1px solid';
-            default: return '1px solid'; // map others to thin
-        }
+    protected function mapBorderStyle($borderStyle)
+    {
+        return (isset(self::$borderStyleMap[$borderStyle])) ? self::$borderStyleMap[$borderStyle] : '1px solid';
     }
 
     /**
@@ -254,8 +263,9 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      *
      * @return int
      */
-    public function getSheetIndex() {
-        return $this->_sheetIndex;
+    public function getSheetIndex()
+    {
+        return $this->sheetIndex;
     }
 
     /**
@@ -264,8 +274,9 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @param    int        $pValue        Sheet index
      * @return PHPExcel\Writer_HTML
      */
-    public function setSheetIndex($pValue = 0) {
-        $this->_sheetIndex = $pValue;
+    public function setSheetIndex($pValue = 0)
+    {
+        $this->sheetIndex = $pValue;
         return $this;
     }
 
@@ -274,26 +285,29 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      *
      * @return boolean
      */
-    public function getGenerateSheetNavigationBlock() {
-        return $this->_generateSheetNavigationBlock;
+    public function getGenerateSheetNavigationBlock()
+    {
+        return $this->generateSheetNavigationBlock;
     }
 
     /**
      * Set sheet index
      *
-     * @param    boolean        $pValue        Flag indicating whether the sheet navigation block should be generated or not
-     * @return PHPExcel\Writer_HTML
+     * @param   boolean   $pValue   Flag indicating whether the sheet navigation block should be generated or not
+     * @return  PHPExcel\Writer_HTML
      */
-    public function setGenerateSheetNavigationBlock($pValue = true) {
-        $this->_generateSheetNavigationBlock = (bool) $pValue;
+    public function setGenerateSheetNavigationBlock($pValue = true)
+    {
+        $this->generateSheetNavigationBlock = (bool) $pValue;
         return $this;
     }
 
     /**
      * Write all sheets (resets sheetIndex to null)
      */
-    public function writeAllSheets() {
-        $this->_sheetIndex = null;
+    public function writeAllSheets()
+    {
+        $this->sheetIndex = null;
         return $this;
     }
 
@@ -304,46 +318,62 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @return    string
      * @throws PHPExcel\Writer_Exception
      */
-    public function generateHTMLHeader($pIncludeStyles = false) {
+    public function generateHTMLHeader($pIncludeStyles = false)
+    {
         // PHPExcel object known?
-        if (is_null($this->_phpExcel)) {
+        if (is_null($this->phpExcel)) {
             throw new Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
         }
 
         // Construct HTML
-        $properties = $this->_phpExcel->getProperties();
+        $properties = $this->phpExcel->getProperties();
         $html = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' . PHP_EOL;
         $html .= '<!-- Generated by PHPExcel - http://www.phpexcel.net -->' . PHP_EOL;
         $html .= '<html>' . PHP_EOL;
         $html .= '  <head>' . PHP_EOL;
         $html .= '      <meta http-equiv="Content-Type" content="text/html; charset=utf-8">' . PHP_EOL;
-        if ($properties->getTitle() > '')
+        if ($properties->getTitle() > '') {
             $html .= '      <title>' . htmlspecialchars($properties->getTitle()) . '</title>' . PHP_EOL;
-
-        if ($properties->getCreator() > '')
-            $html .= '      <meta name="author" content="' . htmlspecialchars($properties->getCreator()) . '" />' . PHP_EOL;
-        if ($properties->getTitle() > '')
-            $html .= '      <meta name="title" content="' . htmlspecialchars($properties->getTitle()) . '" />' . PHP_EOL;
-        if ($properties->getDescription() > '')
-            $html .= '      <meta name="description" content="' . htmlspecialchars($properties->getDescription()) . '" />' . PHP_EOL;
-        if ($properties->getSubject() > '')
-            $html .= '      <meta name="subject" content="' . htmlspecialchars($properties->getSubject()) . '" />' . PHP_EOL;
-        if ($properties->getKeywords() > '')
-            $html .= '      <meta name="keywords" content="' . htmlspecialchars($properties->getKeywords()) . '" />' . PHP_EOL;
-        if ($properties->getCategory() > '')
-            $html .= '      <meta name="category" content="' . htmlspecialchars($properties->getCategory()) . '" />' . PHP_EOL;
-        if ($properties->getCompany() > '')
-            $html .= '      <meta name="company" content="' . htmlspecialchars($properties->getCompany()) . '" />' . PHP_EOL;
-        if ($properties->getManager() > '')
-            $html .= '      <meta name="manager" content="' . htmlspecialchars($properties->getManager()) . '" />' . PHP_EOL;
+        }
+        if ($properties->getCreator() > '') {
+            $html .= '      <meta name="author" content="' .
+                htmlspecialchars($properties->getCreator()) . '" />' . PHP_EOL;
+        }
+        if ($properties->getTitle() > '') {
+            $html .= '      <meta name="title" content="' .
+                htmlspecialchars($properties->getTitle()) . '" />' . PHP_EOL;
+        }
+        if ($properties->getDescription() > '') {
+            $html .= '      <meta name="description" content="' .
+                htmlspecialchars($properties->getDescription()) . '" />' . PHP_EOL;
+        }
+        if ($properties->getSubject() > '') {
+            $html .= '      <meta name="subject" content="' .
+                htmlspecialchars($properties->getSubject()) . '" />' . PHP_EOL;
+        }
+        if ($properties->getKeywords() > '') {
+            $html .= '      <meta name="keywords" content="' .
+                htmlspecialchars($properties->getKeywords()) . '" />' . PHP_EOL;
+        }
+        if ($properties->getCategory() > '') {
+            $html .= '      <meta name="category" content="' .
+                htmlspecialchars($properties->getCategory()) . '" />' . PHP_EOL;
+        }
+        if ($properties->getCompany() > '') {
+            $html .= '      <meta name="company" content="' .
+                htmlspecialchars($properties->getCompany()) . '" />' . PHP_EOL;
+        }
+        if ($properties->getManager() > '') {
+            $html .= '      <meta name="manager" content="' .
+                htmlspecialchars($properties->getManager()) . '" />' . PHP_EOL;
+        }
 
         if ($pIncludeStyles) {
             $html .= $this->generateStyles(true);
         }
 
-        $html .= '  </head>' . PHP_EOL;
-        $html .= '' . PHP_EOL;
-        $html .= '  <body>' . PHP_EOL;
+        $html .= '  </head>' . PHP_EOL . PHP_EOL .
+            '<body>' . PHP_EOL;
 
         // Return
         return $html;
@@ -355,23 +385,24 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @return    string
      * @throws PHPExcel\Writer_Exception
      */
-    public function generateSheetData() {
+    public function generateSheetData()
+    {
         // PHPExcel object known?
-        if (is_null($this->_phpExcel)) {
+        if (is_null($this->phpExcel)) {
             throw new Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
         }
 
         // Ensure that Spans have been calculated?
-        if (!$this->_spansAreCalculated) {
-            $this->_calculateSpans();
+        if (!$this->spansAreCalculated) {
+            $this->calculateSpans();
         }
 
         // Fetch sheets
         $sheets = array();
-        if (is_null($this->_sheetIndex)) {
-            $sheets = $this->_phpExcel->getAllSheets();
+        if (is_null($this->sheetIndex)) {
+            $sheets = $this->phpExcel->getAllSheets();
         } else {
-            $sheets[] = $this->_phpExcel->getSheet($this->_sheetIndex);
+            $sheets[] = $this->phpExcel->getSheet($this->sheetIndex);
         }
 
         // Construct HTML
@@ -381,7 +412,7 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
         $sheetId = 0;
         foreach ($sheets as $sheet) {
             // Write table header
-            $html .= $this->_generateTableHeader($sheet);
+            $html .= $this->generateTableHeader($sheet);
 
             // Get worksheet dimension
             $dimension = explode(':', $sheet->calculateWorksheetDimension());
@@ -410,7 +441,7 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
 
             // Loop through cells
             $row = $rowMin-1;
-            while($row++ < $rowMax) {
+            while ($row++ < $rowMax) {
                 // <thead> ?
                 if ($row == $theadStart) {
                     $html .= '        <thead>' . PHP_EOL;
@@ -422,12 +453,12 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
                 }
 
                 // Write row if there are HTML table cells in it
-                if ( !isset($this->_isSpannedRow[$sheet->getParent()->getIndex($sheet)][$row]) ) {
+                if (!isset($this->isSpannedRow[$sheet->getParent()->getIndex($sheet)][$row])) {
                     // Start a new rowData
                     $rowData = array();
                     // Loop through columns
                     $column = $dimension[0][0] - 1;
-                    while($column++ < $dimension[1][0]) {
+                    while ($column++ < $dimension[1][0]) {
                         // Cell exists?
                         if ($sheet->cellExistsByColumnAndRow($column, $row)) {
                             $rowData[$column] = $sheet->getCellByColumnAndRow($column, $row);
@@ -435,7 +466,7 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
                             $rowData[$column] = '';
                         }
                     }
-                    $html .= $this->_generateRow($sheet, $rowData, $row - 1);
+                    $html .= $this->generateRow($sheet, $rowData, $row - 1);
                 }
 
                 // </thead> ?
@@ -443,17 +474,17 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
                     $html .= '        </thead>' . PHP_EOL;
                 }
             }
-            $html .= $this->_extendRowsForChartsAndImages($sheet, $row);
+            $html .= $this->extendRowsForChartsAndImages($sheet, $row);
 
             // Close table body.
             $html .= '        </tbody>' . PHP_EOL;
 
             // Write table footer
-            $html .= $this->_generateTableFooter();
+            $html .= $this->generateTableFooter();
 
             // Writing PDF?
-            if ($this->_isPdf) {
-                if (is_null($this->_sheetIndex) && $sheetId + 1 < $this->_phpExcel->getSheetCount()) {
+            if ($this->isPdf) {
+                if (is_null($this->sheetIndex) && $sheetId + 1 < $this->phpExcel->getSheetCount()) {
                     $html .= '<div style="page-break-before:always" />';
                 }
             }
@@ -475,16 +506,16 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
     public function generateNavigation()
     {
         // PHPExcel object known?
-        if (is_null($this->_phpExcel)) {
+        if (is_null($this->phpExcel)) {
             throw new Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
         }
 
         // Fetch sheets
         $sheets = array();
-        if (is_null($this->_sheetIndex)) {
-            $sheets = $this->_phpExcel->getAllSheets();
+        if (is_null($this->sheetIndex)) {
+            $sheets = $this->phpExcel->getAllSheets();
         } else {
-            $sheets[] = $this->_phpExcel->getSheet($this->_sheetIndex);
+            $sheets[] = $this->phpExcel->getSheet($this->sheetIndex);
         }
 
         // Construct HTML
@@ -498,7 +529,8 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
             $html .= '<ul class="navigation">' . PHP_EOL;
 
             foreach ($sheets as $sheet) {
-                $html .= '  <li class="sheet' . $sheetId . '"><a href="#sheet' . $sheetId . '">' . $sheet->getTitle() . '</a></li>' . PHP_EOL;
+                $html .= '  <li class="sheet' . $sheetId . '"><a href="#sheet' . $sheetId .
+                    '">' . $sheet->getTitle() . '</a></li>' . PHP_EOL;
                 ++$sheetId;
             }
 
@@ -508,10 +540,11 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
         return $html;
     }
 
-    private function _extendRowsForChartsAndImages(Worksheet $pSheet, $row) {
+    private function extendRowsForChartsAndImages(Worksheet $pSheet, $row)
+    {
         $rowMax = $row;
         $colMax = 'A';
-        if ($this->_includeCharts) {
+        if ($this->includeCharts) {
             foreach ($pSheet->getChartCollection() as $chart) {
                 if ($chart instanceof Chart) {
                     $chartCoordinates = $chart->getTopLeftPosition();
@@ -545,9 +578,9 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
             $html .= '<tr>';
             for ($col = 'A'; $col != $colMax; ++$col) {
                 $html .= '<td>';
-                $html .= $this->_writeImageInCell($pSheet, $col.$row);
-                if ($this->_includeCharts) {
-                    $html .= $this->_writeChartInCell($pSheet, $col.$row);
+                $html .= $this->writeImageInCell($pSheet, $col.$row);
+                if ($this->includeCharts) {
+                    $html .= $this->writeChartInCell($pSheet, $col.$row);
                 }
                 $html .= '</td>';
             }
@@ -566,7 +599,8 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @return    string
      * @throws    PHPExcel\Writer_Exception
      */
-    private function _writeImageInCell(Worksheet $pSheet, $coordinates) {
+    private function writeImageInCell(Worksheet $pSheet, $coordinates)
+    {
         // Construct HTML
         $html = '';
 
@@ -593,12 +627,12 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
                     $filename = htmlspecialchars($filename);
 
                     $html .= PHP_EOL;
-                    if ((!$this->_embedImages) || ($this->_isPdf)) {
+                    if ((!$this->embedImages) || ($this->isPdf)) {
                         $imageData = $filename;
                     } else {
                         $imageDetails = getimagesize($filename);
-                        if ($fp = fopen($filename,"rb", 0)) {
-                            $picture = fread($fp,filesize($filename));
+                        if ($fp = fopen($filename, "rb", 0)) {
+                            $picture = fread($fp, filesize($filename));
                             fclose($fp);
                             // base64 encode the binary data, then break it
                             // into chunks according to RFC 2045 semantics
@@ -610,7 +644,10 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
                     }
 
                     $html .= '<div style="position: relative;">';
-                    $html .= '<img style="position: absolute; z-index: 1; left: ' . $drawing->getOffsetX() . 'px; top: ' . $drawing->getOffsetY() . 'px; width: ' . $drawing->getWidth() . 'px; height: ' . $drawing->getHeight() . 'px;" src="' . $imageData . '" border="0" />' . PHP_EOL;
+                    $html .= '<img style="position: absolute; z-index: 1; left: ' .
+                        $drawing->getOffsetX() . 'px; top: ' . $drawing->getOffsetY() . 'px; width: ' .
+                        $drawing->getWidth() . 'px; height: ' . $drawing->getHeight() . 'px;" src="' .
+                        $imageData . '" border="0" />' . PHP_EOL;
                     $html .= '</div>';
                 }
             }
@@ -628,7 +665,8 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @return    string
      * @throws    PHPExcel\Writer_Exception
      */
-    private function _writeChartInCell(Worksheet $pSheet, $coordinates) {
+    private function writeChartInCell(Worksheet $pSheet, $coordinates)
+    {
         // Construct HTML
         $html = '';
 
@@ -644,8 +682,8 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
 
                     $html .= PHP_EOL;
                     $imageDetails = getimagesize($chartFileName);
-                    if ($fp = fopen($chartFileName,"rb", 0)) {
-                        $picture = fread($fp,filesize($chartFileName));
+                    if ($fp = fopen($chartFileName, "rb", 0)) {
+                        $picture = fread($fp, filesize($chartFileName));
                         fclose($fp);
                         // base64 encode the binary data, then break it
                         // into chunks according to RFC 2045 semantics
@@ -653,7 +691,10 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
                         $imageData = 'data:'.$imageDetails['mime'].';base64,' . $base64;
 
                         $html .= '<div style="position: relative;">';
-                        $html .= '<img style="position: absolute; z-index: 1; left: ' . $chartCoordinates['xOffset'] . 'px; top: ' . $chartCoordinates['yOffset'] . 'px; width: ' . $imageDetails[0] . 'px; height: ' . $imageDetails[1] . 'px;" src="' . $imageData . '" border="0" />' . PHP_EOL;
+                        $html .= '<img style="position: absolute; z-index: 1; left: ' .
+                            $chartCoordinates['xOffset'] . 'px; top: ' . $chartCoordinates['yOffset'] . 'px; width: ' .
+                            $imageDetails[0] . 'px; height: ' . $imageDetails[1] . 'px;" src="' .
+                            $imageData . '" border="0" />' . PHP_EOL;
                         $html .= '</div>';
 
                         unlink($chartFileName);
@@ -673,9 +714,10 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @return    string
      * @throws    PHPExcel\Writer_Exception
      */
-    public function generateStyles($generateSurroundingHTML = true) {
+    public function generateStyles($generateSurroundingHTML = true)
+    {
         // PHPExcel object known?
-        if (is_null($this->_phpExcel)) {
+        if (is_null($this->phpExcel)) {
             throw new Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
         }
 
@@ -688,13 +730,13 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
         // Start styles
         if ($generateSurroundingHTML) {
             $html .= '    <style type="text/css">' . PHP_EOL;
-            $html .= '      html { ' . $this->_assembleCSS($css['html']) . ' }' . PHP_EOL;
+            $html .= '      html { ' . $this->assembleCSS($css['html']) . ' }' . PHP_EOL;
         }
 
         // Write all other styles
         foreach ($css as $styleName => $styleDefinition) {
             if ($styleName != 'html') {
-                $html .= '      ' . $styleName . ' { ' . $this->_assembleCSS($styleDefinition) . ' }' . PHP_EOL;
+                $html .= '      ' . $styleName . ' { ' . $this->assembleCSS($styleDefinition) . ' }' . PHP_EOL;
             }
         }
 
@@ -714,20 +756,21 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @return    array
      * @throws    PHPExcel\Writer_Exception
      */
-    public function buildCSS($generateSurroundingHTML = true) {
+    public function buildCSS($generateSurroundingHTML = true)
+    {
         // PHPExcel object known?
-        if (is_null($this->_phpExcel)) {
+        if (is_null($this->phpExcel)) {
             throw new Writer_Exception('Internal PHPExcel object not set to an instance of an object.');
         }
 
         // Cached?
-        if (!is_null($this->_cssStyles)) {
-            return $this->_cssStyles;
+        if (!is_null($this->cssStyles)) {
+            return $this->cssStyles;
         }
 
         // Ensure that spans have been calculated
-        if (!$this->_spansAreCalculated) {
-            $this->_calculateSpans();
+        if (!$this->spansAreCalculated) {
+            $this->calculateSpans();
         }
 
         // Construct CSS
@@ -744,7 +787,7 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
 
         // table { }
         $css['table']['border-collapse']  = 'collapse';
-        if (!$this->_isPdf) {
+        if (!$this->isPdf) {
             $css['table']['page-break-after'] = 'always';
         }
 
@@ -770,16 +813,16 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
         $css['.s']['text-align'] = 'left'; // STRING
 
         // Calculate cell style hashes
-        foreach ($this->_phpExcel->getCellXfCollection() as $index => $style) {
-            $css['td.style' . $index] = $this->_createCSSStyle( $style );
+        foreach ($this->phpExcel->getCellXfCollection() as $index => $style) {
+            $css['td.style' . $index] = $this->createCSSStyle($style);
         }
 
         // Fetch sheets
         $sheets = array();
-        if (is_null($this->_sheetIndex)) {
-            $sheets = $this->_phpExcel->getAllSheets();
+        if (is_null($this->sheetIndex)) {
+            $sheets = $this->phpExcel->getAllSheets();
         } else {
-            $sheets[] = $this->_phpExcel->getSheet($this->_sheetIndex);
+            $sheets[] = $this->phpExcel->getSheet($this->sheetIndex);
         }
 
         // Build styles per sheet
@@ -794,17 +837,19 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
             // col elements, initialize
             $highestColumnIndex = Cell::columnIndexFromString($sheet->getHighestColumn()) - 1;
             $column = -1;
-            while($column++ < $highestColumnIndex) {
-                $this->_columnWidths[$sheetIndex][$column] = 42; // approximation
+            while ($column++ < $highestColumnIndex) {
+                $this->columnWidths[$sheetIndex][$column] = 42; // approximation
                 $css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = '42pt';
             }
 
             // col elements, loop through columnDimensions and set width
             foreach ($sheet->getColumnDimensions() as $columnDimension) {
-                if (($width = Shared_Drawing::cellDimensionToPixels($columnDimension->getWidth(), $this->_defaultFont)) >= 0) {
+                if (($width =
+                    Shared_Drawing::cellDimensionToPixels($columnDimension->getWidth(), $this->defaultFont)) >= 0
+                ) {
                     $width = Shared_Drawing::pixelsToPoints($width);
                     $column = Cell::columnIndexFromString($columnDimension->getColumnIndex()) - 1;
-                    $this->_columnWidths[$sheetIndex][$column] = $width;
+                    $this->columnWidths[$sheetIndex][$column] = $width;
                     $css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = $width . 'pt';
 
                     if ($columnDimension->getVisible() === false) {
@@ -821,7 +866,7 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
             $css['table.sheet' . $sheetIndex . ' tr'] = array();
 
             if ($rowDimension->getRowHeight() == -1) {
-                $pt_height = Shared_Font::getDefaultRowHeightByFont($this->_phpExcel->getDefaultStyle()->getFont());
+                $pt_height = Shared_Font::getDefaultRowHeightByFont($this->phpExcel->getDefaultStyle()->getFont());
             } else {
                 $pt_height = $rowDimension->getRowHeight();
             }
@@ -839,7 +884,7 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
                 $css['table.sheet' . $sheetIndex . ' tr.row' . $row] = array();
 
                 if ($rowDimension->getRowHeight() == -1) {
-                    $pt_height = Shared_Font::getDefaultRowHeightByFont($this->_phpExcel->getDefaultStyle()->getFont());
+                    $pt_height = Shared_Font::getDefaultRowHeightByFont($this->phpExcel->getDefaultStyle()->getFont());
                 } else {
                     $pt_height = $rowDimension->getRowHeight();
                 }
@@ -852,8 +897,8 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
         }
 
         // Cache
-        if (is_null($this->_cssStyles)) {
-            $this->_cssStyles = $css;
+        if (is_null($this->cssStyles)) {
+            $this->cssStyles = $css;
         }
 
         // Return
@@ -866,16 +911,14 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @param    PHPExcel\Style        $pStyle            PHPExcel Style
      * @return    array
      */
-    private function _createCSSStyle(Style $pStyle) {
-        // Construct CSS
-        $css = '';
-
+    private function createCSSStyle(Style $pStyle)
+    {
         // Create CSS
         $css = array_merge(
-            $this->_createCSSStyleAlignment($pStyle->getAlignment())
-            , $this->_createCSSStyleBorders($pStyle->getBorders())
-            , $this->_createCSSStyleFont($pStyle->getFont())
-            , $this->_createCSSStyleFill($pStyle->getFill())
+            $this->createCSSStyleAlignment($pStyle->getAlignment()),
+            $this->createCSSStyleBorders($pStyle->getBorders()),
+            $this->createCSSStyleFont($pStyle->getFont()),
+            $this->createCSSStyleFill($pStyle->getFill())
         );
 
         // Return
@@ -888,16 +931,18 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @param    PHPExcel\Style_Alignment        $pStyle            PHPExcel Style Alignment
      * @return    array
      */
-    private function _createCSSStyleAlignment(Style_Alignment $pStyle) {
+    private function createCSSStyleAlignment(Style_Alignment $pStyle)
+    {
         // Construct CSS
         $css = array();
 
         // Create CSS
-        $css['vertical-align'] = $this->_mapVAlign($pStyle->getVertical());
-        if ($textAlign = $this->_mapHAlign($pStyle->getHorizontal())) {
+        $css['vertical-align'] = $this->mapVAlign($pStyle->getVertical());
+        if ($textAlign = $this->mapHAlign($pStyle->getHorizontal())) {
             $css['text-align'] = $textAlign;
-            if(in_array($textAlign,array('left','right')))
+            if (in_array($textAlign, array('left', 'right'))) {
                 $css['padding-'.$textAlign] = (string)((int)$pStyle->getIndent() * 9).'px';
+            }
         }
 
         // Return
@@ -910,7 +955,8 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @param    PHPExcel\Style_Font        $pStyle            Font Style
      * @return    array
      */
-    private function _createCSSStyleFont(Style_Font $pStyle) {
+    private function createCSSStyleFont(Style_Font $pStyle)
+    {
         // Construct CSS
         $css = array();
 
@@ -920,9 +966,9 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
         }
         if ($pStyle->getUnderline() != Style_Font::UNDERLINE_NONE && $pStyle->getStrikethrough()) {
             $css['text-decoration'] = 'underline line-through';
-        } else if ($pStyle->getUnderline() != Style_Font::UNDERLINE_NONE) {
+        } elseif ($pStyle->getUnderline() != Style_Font::UNDERLINE_NONE) {
             $css['text-decoration'] = 'underline';
-        } else if ($pStyle->getStrikethrough()) {
+        } elseif ($pStyle->getStrikethrough()) {
             $css['text-decoration'] = 'line-through';
         }
         if ($pStyle->getItalic()) {
@@ -943,15 +989,16 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @param    PHPExcel\Style_Borders        $pStyle            Cell Borders Style
      * @return    array
      */
-    private function _createCSSStyleBorders(Style_Borders $pStyle) {
+    private function createCSSStyleBorders(Style_Borders $pStyle)
+    {
         // Construct CSS
         $css = array();
 
         // Create CSS
-        $css['border-bottom']    = $this->_createCSSStyleBorder($pStyle->getBottom());
-        $css['border-top']        = $this->_createCSSStyleBorder($pStyle->getTop());
-        $css['border-left']        = $this->_createCSSStyleBorder($pStyle->getLeft());
-        $css['border-right']    = $this->_createCSSStyleBorder($pStyle->getRight());
+        $css['border-bottom']    = $this->createCSSStyleBorder($pStyle->getBottom());
+        $css['border-top']        = $this->createCSSStyleBorder($pStyle->getTop());
+        $css['border-left']        = $this->createCSSStyleBorder($pStyle->getLeft());
+        $css['border-right']    = $this->createCSSStyleBorder($pStyle->getRight());
 
         // Return
         return $css;
@@ -963,11 +1010,11 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @param    PHPExcel\Style_Border        $pStyle            Border Style
      * @return    string
      */
-    private function _createCSSStyleBorder(Style_Border $pStyle) {
+    private function createCSSStyleBorder(Style_Border $pStyle)
+    {
         // Create CSS
-//        $css = $this->_mapBorderStyle($pStyle->getBorderStyle()) . ' #' . $pStyle->getColor()->getRGB();
         //    Create CSS - add !important to non-none border styles for merged cells
-        $borderStyle = $this->_mapBorderStyle($pStyle->getBorderStyle());
+        $borderStyle = $this->mapBorderStyle($pStyle->getBorderStyle());
         $css = $borderStyle . ' #' . $pStyle->getColor()->getRGB() . (($borderStyle == 'none') ? '' : ' !important');
 
         // Return
@@ -980,7 +1027,8 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @param    PHPExcel\Style_Fill        $pStyle            Fill Style
      * @return    array
      */
-    private function _createCSSStyleFill(Style_Fill $pStyle) {
+    private function createCSSStyleFill(Style_Fill $pStyle)
+    {
         // Construct HTML
         $css = array();
 
@@ -996,7 +1044,8 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
     /**
      * Generate HTML footer
      */
-    public function generateHTMLFooter() {
+    public function generateHTMLFooter()
+    {
         // Construct HTML
         $html = '';
         $html .= '  </body>' . PHP_EOL;
@@ -1013,37 +1062,41 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @return    string
      * @throws    PHPExcel\Writer_Exception
      */
-    private function _generateTableHeader($pSheet) {
+    private function generateTableHeader($pSheet)
+    {
         $sheetIndex = $pSheet->getParent()->getIndex($pSheet);
 
         // Construct HTML
         $html = '';
-        $html .= $this->_setMargins($pSheet);
+        $html .= $this->setMargins($pSheet);
 
-        if (!$this->_useInlineCss) {
+        if (!$this->useInlineCss) {
             $gridlines = $pSheet->getShowGridLines() ? ' gridlines' : '';
-            $html .= '    <table border="0" cellpadding="0" cellspacing="0" id="sheet' . $sheetIndex . '" class="sheet' . $sheetIndex . $gridlines . '">' . PHP_EOL;
+            $html .= '    <table border="0" cellpadding="0" cellspacing="0" id="sheet' .
+                $sheetIndex . '" class="sheet' . $sheetIndex . $gridlines . '">' . PHP_EOL;
         } else {
-            $style = isset($this->_cssStyles['table']) ?
-                $this->_assembleCSS($this->_cssStyles['table']) : '';
+            $style = isset($this->cssStyles['table']) ?
+                $this->assembleCSS($this->cssStyles['table']) : '';
 
-            if ($this->_isPdf && $pSheet->getShowGridLines()) {
-                $html .= '    <table border="1" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="1" style="' . $style . '">' . PHP_EOL;
+            if ($this->isPdf && $pSheet->getShowGridLines()) {
+                $html .= '    <table border="1" cellpadding="1" id="sheet' . $sheetIndex .
+                    '" cellspacing="1" style="' . $style . '">' . PHP_EOL;
             } else {
-                $html .= '    <table border="0" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="0" style="' . $style . '">' . PHP_EOL;
+                $html .= '    <table border="0" cellpadding="1" id="sheet' . $sheetIndex .
+                    '" cellspacing="0" style="' . $style . '">' . PHP_EOL;
             }
         }
 
         // Write <col> elements
         $highestColumnIndex = Cell::columnIndexFromString($pSheet->getHighestColumn()) - 1;
         $i = -1;
-        while($i++ < $highestColumnIndex) {
-            if (!$this->_isPdf) {
-                if (!$this->_useInlineCss) {
+        while ($i++ < $highestColumnIndex) {
+            if (!$this->isPdf) {
+                if (!$this->useInlineCss) {
                     $html .= '        <col class="col' . $i . '">' . PHP_EOL;
                 } else {
-                    $style = isset($this->_cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) ?
-                        $this->_assembleCSS($this->_cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) : '';
+                    $style = isset($this->cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) ?
+                        $this->assembleCSS($this->cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) : '';
                     $html .= '        <col style="' . $style . '">' . PHP_EOL;
                 }
             }
@@ -1057,7 +1110,8 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * Generate table footer
      *
      */
-    private function _generateTableFooter() {
+    private function generateTableFooter()
+    {
         // Construct HTML
         $html = '';
         $html .= '    </table>' . PHP_EOL;
@@ -1075,7 +1129,8 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @return    string
      * @throws    PHPExcel\Writer_Exception
      */
-    private function _generateRow(Worksheet $pSheet, $pValues = null, $pRow = 0) {
+    private function generateRow(Worksheet $pSheet, $pValues = null, $pRow = 0)
+    {
         if (is_array($pValues)) {
             // Construct HTML
             $html = '';
@@ -1084,28 +1139,28 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
             $sheetIndex = $pSheet->getParent()->getIndex($pSheet);
 
             // DomPDF and breaks
-            if ($this->_isPdf && count($pSheet->getBreaks()) > 0) {
+            if ($this->isPdf && count($pSheet->getBreaks()) > 0) {
                 $breaks = $pSheet->getBreaks();
 
                 // check if a break is needed before this row
                 if (isset($breaks['A' . $pRow])) {
                     // close table: </table>
-                    $html .= $this->_generateTableFooter();
+                    $html .= $this->generateTableFooter();
 
                     // insert page break
                     $html .= '<div style="page-break-before:always" />';
 
                     // open table again: <table> + <col> etc.
-                    $html .= $this->_generateTableHeader($pSheet);
+                    $html .= $this->generateTableHeader($pSheet);
                 }
             }
 
             // Write row start
-            if (!$this->_useInlineCss) {
+            if (!$this->useInlineCss) {
                 $html .= '          <tr class="row' . $pRow . '">' . PHP_EOL;
             } else {
-                $style = isset($this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow])
-                    ? $this->_assembleCSS($this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]) : '';
+                $style = isset($this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow])
+                    ? $this->assembleCSS($this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]) : '';
 
                 $html .= '          <tr style="' . $style . '">' . PHP_EOL;
             }
@@ -1115,13 +1170,13 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
             foreach ($pValues as $cell) {
                 $coordinate = Cell::stringFromColumnIndex($colNum) . ($pRow + 1);
 
-                if (!$this->_useInlineCss) {
+                if (!$this->useInlineCss) {
                     $cssClass = '';
                     $cssClass = 'column' . $colNum;
                 } else {
                     $cssClass = array();
-                    if (isset($this->_cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum])) {
-                        $this->_cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum];
+                    if (isset($this->cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum])) {
+                        $this->cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum];
                     }
                 }
                 $colSpan = 1;
@@ -1143,11 +1198,13 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
                         foreach ($elements as $element) {
                             // Rich text start?
                             if ($element instanceof RichText_Run) {
-                                $cellData .= '<span style="' . $this->_assembleCSS($this->_createCSSStyleFont($element->getFont())) . '">';
+                                $cellData .= '<span style="' .
+                                    $this->assembleCSS($this->createCSSStyleFont($element->getFont())) .
+                                    '">';
 
                                 if ($element->getFont()->getSuperScript()) {
                                     $cellData .= '<sup>';
-                                } else if ($element->getFont()->getSubScript()) {
+                                } elseif ($element->getFont()->getSubScript()) {
                                     $cellData .= '<sub>';
                                 }
                             }
@@ -1159,7 +1216,7 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
                             if ($element instanceof RichText_Run) {
                                 if ($element->getFont()->getSuperScript()) {
                                     $cellData .= '</sup>';
-                                } else if ($element->getFont()->getSubScript()) {
+                                } elseif ($element->getFont()->getSubScript()) {
                                     $cellData .= '</sub>';
                                 }
 
@@ -1167,28 +1224,33 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
                             }
                         }
                     } else {
-                        if ($this->_preCalculateFormulas) {
+                        if ($this->preCalculateFormulas) {
                             $cellData = Style_NumberFormat::toFormattedString(
                                 $cell->getCalculatedValue(),
-                                $pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getNumberFormat()->getFormatCode(),
+                                $pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())
+                                    ->getNumberFormat()->getFormatCode(),
                                 array($this, 'formatColor')
                             );
                         } else {
                             $cellData = Style_NumberFormat::ToFormattedString(
                                 $cell->getValue(),
-                                $pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getNumberFormat()->getFormatCode(),
+                                $pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())
+                                    ->getNumberFormat()->getFormatCode(),
                                 array($this, 'formatColor')
                             );
                         }
                         $cellData = htmlspecialchars($cellData);
-                        if ($pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getFont()->getSuperScript()) {
+                        if ($pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())
+                            ->getFont()->getSuperScript()) {
                             $cellData = '<sup>'.$cellData.'</sup>';
-                        } elseif ($pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getFont()->getSubScript()) {
+                        } elseif ($pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())
+                            ->getFont()->getSubScript()) {
                             $cellData = '<sub>'.$cellData.'</sub>';
                         }
                     }
 
-                    // Converts the cell content so that spaces occuring at beginning of each new line are replaced by &nbsp;
+                    // Converts the cell content so that spaces occuring at beginning of each new line are
+                    //     replaced by &nbsp;
                     // Example: "  Hello\n to the world" is converted to "&nbsp;&nbsp;Hello\n&nbsp;to the world"
                     $cellData = preg_replace("/(?m)(?:^|\\G) /", '&nbsp;', $cellData);
 
@@ -1196,45 +1258,50 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
                     $cellData = nl2br($cellData);
 
                     // Extend CSS class?
-                    if (!$this->_useInlineCss) {
+                    if (!$this->useInlineCss) {
                         $cssClass .= ' style' . $cell->getXfIndex();
                         $cssClass .= ' ' . $cell->getDataType();
                     } else {
-                        if (isset($this->_cssStyles['td.style' . $cell->getXfIndex()])) {
-                            $cssClass = array_merge($cssClass, $this->_cssStyles['td.style' . $cell->getXfIndex()]);
+                        if (isset($this->cssStyles['td.style' . $cell->getXfIndex()])) {
+                            $cssClass = array_merge($cssClass, $this->cssStyles['td.style' . $cell->getXfIndex()]);
                         }
 
                         // General horizontal alignment: Actual horizontal alignment depends on dataType
-                        $sharedStyle = $pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() );
-                        if ($sharedStyle->getAlignment()->getHorizontal() == Style_Alignment::HORIZONTAL_GENERAL
-                            && isset($this->_cssStyles['.' . $cell->getDataType()]['text-align']))
-                        {
-                            $cssClass['text-align'] = $this->_cssStyles['.' . $cell->getDataType()]['text-align'];
+                        $sharedStyle = $pSheet->getParent()->getCellXfByIndex($cell->getXfIndex());
+                        if ($sharedStyle->getAlignment()->getHorizontal() == Style_Alignment::HORIZONTAL_GENERAL &&
+                            isset($this->cssStyles['.' . $cell->getDataType()]['text-align'])
+                        ) {
+                            $cssClass['text-align'] = $this->cssStyles['.' . $cell->getDataType()]['text-align'];
                         }
                     }
                 }
 
                 // Hyperlink?
-                if ($pSheet->hyperlinkExists($coordinate) && !$pSheet->getHyperlink($coordinate)->isInternal()) {
-                    $cellData = '<a href="' . htmlspecialchars($pSheet->getHyperlink($coordinate)->getUrl()) . '" title="' . htmlspecialchars($pSheet->getHyperlink($coordinate)->getTooltip()) . '">' . $cellData . '</a>';
+                if ($pSheet->hyperlinkExists($coordinate) &&
+                    !$pSheet->getHyperlink($coordinate)->isInternal()
+                ) {
+                    $cellData = '<a href="' . htmlspecialchars($pSheet->getHyperlink($coordinate)->getUrl()) .
+                    '" title="' . htmlspecialchars($pSheet->getHyperlink($coordinate)->getTooltip()) . '">' .
+                    $cellData . '</a>';
                 }
 
                 // Should the cell be written or is it swallowed by a rowspan or colspan?
-                $writeCell = ! ( isset($this->_isSpannedCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum])
-                            && $this->_isSpannedCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum] );
+                $writeCell = !(
+                    isset($this->isSpannedCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum]) &&
+                    $this->isSpannedCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum]
+                );
 
                 // Colspan and Rowspan
-                $colspan = 1;
-                $rowspan = 1;
-                if (isset($this->_isBaseCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum])) {
-                    $spans = $this->_isBaseCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum];
+                $colspan = $rowspan = 1;
+                if (isset($this->isBaseCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum])) {
+                    $spans = $this->isBaseCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum];
                     $rowSpan = $spans['rowspan'];
                     $colSpan = $spans['colspan'];
 
                     //    Also apply style from last cell in merge to fix borders -
                     //        relies on !important for non-none border declarations in _createCSSStyleBorder
                     $endCellCoord = Cell::stringFromColumnIndex($colNum + $colSpan - 1) . ($pRow + $rowSpan);
-                    if (!$this->_useInlineCss) {
+                    if (!$this->useInlineCss) {
                         $cssClass .= ' style' . $pSheet->getCell($endCellCoord)->getXfIndex();
                     }
                 }
@@ -1243,46 +1310,46 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
                 if ($writeCell) {
                     // Column start
                     $html .= '            <td';
-                        if (!$this->_useInlineCss) {
-                            $html .= ' class="' . $cssClass . '"';
-                        } else {
-                            //** Necessary redundant code for the sake of PHPExcel\Writer_PDF **
-                            // We must explicitly write the width of the <td> element because TCPDF
-                            // does not recognize e.g. <col style="width:42pt">
-                            $width = 0;
-                            $i = $colNum - 1;
-                            $e = $colNum + $colSpan - 1;
-                            while($i++ < $e) {
-                                if (isset($this->_columnWidths[$sheetIndex][$i])) {
-                                    $width += $this->_columnWidths[$sheetIndex][$i];
-                                }
+                    if (!$this->useInlineCss) {
+                        $html .= ' class="' . $cssClass . '"';
+                    } else {
+                        //** Necessary redundant code for the sake of PHPExcel\Writer_PDF **
+                        // We must explicitly write the width of the <td> element because TCPDF
+                        // does not recognize e.g. <col style="width:42pt">
+                        $width = 0;
+                        $i = $colNum - 1;
+                        $e = $colNum + $colSpan - 1;
+                        while ($i++ < $e) {
+                            if (isset($this->columnWidths[$sheetIndex][$i])) {
+                                $width += $this->columnWidths[$sheetIndex][$i];
                             }
-                            $cssClass['width'] = $width . 'pt';
+                        }
+                        $cssClass['width'] = $width . 'pt';
 
-                            // We must also explicitly write the height of the <td> element because TCPDF
-                            // does not recognize e.g. <tr style="height:50pt">
-                            if (isset($this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]['height'])) {
-                                $height = $this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]['height'];
-                                $cssClass['height'] = $height;
-                            }
-                            //** end of redundant code **
+                        // We must also explicitly write the height of the <td> element because TCPDF
+                        // does not recognize e.g. <tr style="height:50pt">
+                        if (isset($this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]['height'])) {
+                            $height = $this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]['height'];
+                            $cssClass['height'] = $height;
+                        }
+                        //** end of redundant code **
 
-                            $html .= ' style="' . $this->_assembleCSS($cssClass) . '"';
-                        }
-                        if ($colSpan > 1) {
-                            $html .= ' colspan="' . $colSpan . '"';
-                        }
-                        if ($rowSpan > 1) {
-                            $html .= ' rowspan="' . $rowSpan . '"';
-                        }
+                        $html .= ' style="' . $this->assembleCSS($cssClass) . '"';
+                    }
+                    if ($colSpan > 1) {
+                        $html .= ' colspan="' . $colSpan . '"';
+                    }
+                    if ($rowSpan > 1) {
+                        $html .= ' rowspan="' . $rowSpan . '"';
+                    }
                     $html .= '>';
 
                     // Image?
-                    $html .= $this->_writeImageInCell($pSheet, $coordinate);
+                    $html .= $this->writeImageInCell($pSheet, $coordinate);
 
                     // Chart?
-                    if ($this->_includeCharts) {
-                        $html .= $this->_writeChartInCell($pSheet, $coordinate);
+                    if ($this->includeCharts) {
+                        $html .= $this->writeChartInCell($pSheet, $coordinate);
                     }
 
                     // Cell data
@@ -1312,7 +1379,7 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @param array
      * @return string
      */
-    private function _assembleCSS($pValue = array())
+    private function assembleCSS($pValue = array())
     {
         $pairs = array();
         foreach ($pValue as $property => $value) {
@@ -1328,8 +1395,9 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      *
      * @return string
      */
-    public function getImagesRoot() {
-        return $this->_imagesRoot;
+    public function getImagesRoot()
+    {
+        return $this->imagesRoot;
     }
 
     /**
@@ -1338,8 +1406,9 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @param string $pValue
      * @return PHPExcel\Writer_HTML
      */
-    public function setImagesRoot($pValue = '.') {
-        $this->_imagesRoot = $pValue;
+    public function setImagesRoot($pValue = '.')
+    {
+        $this->imagesRoot = $pValue;
         return $this;
     }
 
@@ -1348,8 +1417,9 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      *
      * @return boolean
      */
-    public function getEmbedImages() {
-        return $this->_embedImages;
+    public function getEmbedImages()
+    {
+        return $this->embedImages;
     }
 
     /**
@@ -1358,8 +1428,9 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @param boolean $pValue
      * @return PHPExcel\Writer_HTML
      */
-    public function setEmbedImages($pValue = '.') {
-        $this->_embedImages = $pValue;
+    public function setEmbedImages($pValue = '.')
+    {
+        $this->embedImages = $pValue;
         return $this;
     }
 
@@ -1368,8 +1439,9 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      *
      * @return boolean
      */
-    public function getUseInlineCss() {
-        return $this->_useInlineCss;
+    public function getUseInlineCss()
+    {
+        return $this->useInlineCss;
     }
 
     /**
@@ -1378,8 +1450,9 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
      * @param boolean $pValue
      * @return PHPExcel\Writer_HTML
      */
-    public function setUseInlineCss($pValue = false) {
-        $this->_useInlineCss = $pValue;
+    public function setUseInlineCss($pValue = false)
+    {
+        $this->useInlineCss = $pValue;
         return $this;
     }
 
@@ -1417,16 +1490,16 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
     /**
      * Calculate information about HTML colspan and rowspan which is not always the same as Excel's
      */
-    private function _calculateSpans()
+    protected function calculateSpans()
     {
         // Identify all cells that should be omitted in HTML due to cell merge.
         // In HTML only the upper-left cell should be written and it should have
         //   appropriate rowspan / colspan attribute
-        $sheetIndexes = $this->_sheetIndex !== null ?
-            array($this->_sheetIndex) : range(0, $this->_phpExcel->getSheetCount() - 1);
+        $sheetIndexes = $this->sheetIndex !== null ?
+            array($this->sheetIndex) : range(0, $this->phpExcel->getSheetCount() - 1);
 
         foreach ($sheetIndexes as $sheetIndex) {
-            $sheet = $this->_phpExcel->getSheet($sheetIndex);
+            $sheet = $this->phpExcel->getSheet($sheetIndex);
 
             $candidateSpannedRow  = array();
 
@@ -1444,20 +1517,20 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
 
                 // loop through the individual cells in the individual merge
                 $r = $fr - 1;
-                while($r++ < $lr) {
+                while ($r++ < $lr) {
                     // also, flag this row as a HTML row that is candidate to be omitted
                     $candidateSpannedRow[$r] = $r;
 
                     $c = $fc - 1;
-                    while($c++ < $lc) {
-                        if ( !($c == $fc && $r == $fr) ) {
+                    while ($c++ < $lc) {
+                        if (!($c == $fc && $r == $fr)) {
                             // not the upper-left cell (should not be written in HTML)
-                            $this->_isSpannedCell[$sheetIndex][$r][$c] = array(
+                            $this->isSpannedCell[$sheetIndex][$r][$c] = array(
                                 'baseCell' => array($fr, $fc),
                             );
                         } else {
                             // upper-left is the base cell that should hold the colspan/rowspan attribute
-                            $this->_isBaseCell[$sheetIndex][$r][$c] = array(
+                            $this->isBaseCell[$sheetIndex][$r][$c] = array(
                                 'xlrowspan' => $lr - $fr + 1, // Excel rowspan
                                 'rowspan'   => $lr - $fr + 1, // HTML rowspan, value may change
                                 'xlcolspan' => $lc - $fc + 1, // Excel colspan
@@ -1472,25 +1545,25 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
             //   participate in a merge and the where base cells are somewhere above.
             $countColumns = Cell::columnIndexFromString($sheet->getHighestColumn());
             foreach ($candidateSpannedRow as $rowIndex) {
-                if (isset($this->_isSpannedCell[$sheetIndex][$rowIndex])) {
-                    if (count($this->_isSpannedCell[$sheetIndex][$rowIndex]) == $countColumns) {
-                        $this->_isSpannedRow[$sheetIndex][$rowIndex] = $rowIndex;
+                if (isset($this->isSpannedCell[$sheetIndex][$rowIndex])) {
+                    if (count($this->isSpannedCell[$sheetIndex][$rowIndex]) == $countColumns) {
+                        $this->isSpannedRow[$sheetIndex][$rowIndex] = $rowIndex;
                     };
                 }
             }
 
             // For each of the omitted rows we found above, the affected rowspans should be subtracted by 1
-            if ( isset($this->_isSpannedRow[$sheetIndex]) ) {
-                foreach ($this->_isSpannedRow[$sheetIndex] as $rowIndex) {
+            if (isset($this->isSpannedRow[$sheetIndex])) {
+                foreach ($this->isSpannedRow[$sheetIndex] as $rowIndex) {
                     $adjustedBaseCells = array();
                     $c = -1;
                     $e = $countColumns - 1;
-                    while($c++ < $e) {
-                        $baseCell = $this->_isSpannedCell[$sheetIndex][$rowIndex][$c]['baseCell'];
+                    while ($c++ < $e) {
+                        $baseCell = $this->isSpannedCell[$sheetIndex][$rowIndex][$c]['baseCell'];
 
-                        if ( !in_array($baseCell, $adjustedBaseCells) ) {
+                        if (!in_array($baseCell, $adjustedBaseCells)) {
                             // subtract rowspan by 1
-                            --$this->_isBaseCell[$sheetIndex][ $baseCell[0] ][ $baseCell[1] ]['rowspan'];
+                            --$this->isBaseCell[$sheetIndex][ $baseCell[0] ][ $baseCell[1] ]['rowspan'];
                             $adjustedBaseCells[] = $baseCell;
                         }
                     }
@@ -1501,10 +1574,11 @@ class Writer_HTML extends Writer_Abstract implements Writer_IWriter {
         }
 
         // We have calculated the spans
-        $this->_spansAreCalculated = true;
+        $this->spansAreCalculated = true;
     }
 
-    private function _setMargins(Worksheet $pSheet) {
+    private function setMargins(Worksheet $pSheet)
+    {
         $htmlPage = '@page { ';
         $htmlBody = 'body { ';
 
diff --git a/Classes/PHPExcel/Writer/PDF/Core.php b/Classes/PHPExcel/Writer/PDF/Core.php
index d9c93b5..5ac33d0 100644
--- a/Classes/PHPExcel/Writer/PDF/Core.php
+++ b/Classes/PHPExcel/Writer/PDF/Core.php
@@ -330,9 +330,9 @@ abstract class Writer_PDF_Core extends Writer_HTML
     protected function prepareForSave($pFilename = null)
     {
         //  garbage collect
-        $this->_phpExcel->garbageCollect();
+        $this->phpExcel->garbageCollect();
 
-        $this->_saveArrayReturnType = Calculation::getArrayReturnType();
+        $this->saveArrayReturnType = Calculation::getArrayReturnType();
         Calculation::setArrayReturnType(Calculation::RETURN_ARRAY_AS_VALUE);
 
         //  Open file
@@ -342,7 +342,7 @@ abstract class Writer_PDF_Core extends Writer_HTML
         }
 
         //  Set PDF
-        $this->_isPdf = true;
+        $this->isPdf = true;
         //  Build CSS
         $this->buildCSS(true);
 
@@ -360,6 +360,6 @@ abstract class Writer_PDF_Core extends Writer_HTML
         //  Close file
         fclose($fileHandle);
 
-        Calculation::setArrayReturnType($this->_saveArrayReturnType);
+        Calculation::setArrayReturnType($this->saveArrayReturnType);
     }
 }
diff --git a/Classes/PHPExcel/Writer/PDF/tcPDF.php b/Classes/PHPExcel/Writer/PDF/tcPDF.php
index 4093b2a..d8b2c6b 100644
--- a/Classes/PHPExcel/Writer/PDF/tcPDF.php
+++ b/Classes/PHPExcel/Writer/PDF/tcPDF.php
@@ -107,7 +107,7 @@ class Writer_PDF_tcPDF extends Writer_PDF_Core implements Writer_IWriter
         $pdf->setFontSubsetting(false);
         //    Set margins, converting inches to points (using 72 dpi)
         $pdf->SetMargins($printMargins->getLeft() * 72, $printMargins->getTop() * 72, $printMargins->getRight() * 72);
-        $pdf->SetAutoPageBreak(TRUE, $printMargins->getBottom() * 72);
+        $pdf->SetAutoPageBreak(true, $printMargins->getBottom() * 72);
 
         $pdf->setPrintHeader(false);
         $pdf->setPrintFooter(false);