diff --git a/Classes/PHPExcel.php b/Classes/PHPExcel.php
index ec98ad0..5c66cf4 100644
--- a/Classes/PHPExcel.php
+++ b/Classes/PHPExcel.php
@@ -227,7 +227,9 @@ class PHPExcel
     public function addSheet(PHPExcel_Worksheet $pSheet, $iSheetIndex = NULL)
     {
         if ($this->sheetNameExists($pSheet->getTitle())) {
-            throw new PHPExcel_Exception("Workbook already contains a worksheet named '{$pSheet->getTitle()}'. Rename this worksheet first.");
+            throw new PHPExcel_Exception(
+            	"Workbook already contains a worksheet named '{$pSheet->getTitle()}'. Rename this worksheet first."
+            );
         }
 
         if($iSheetIndex === NULL) {
@@ -260,8 +262,13 @@ class PHPExcel
      */
     public function removeSheetByIndex($pIndex = 0)
     {
-        if ($pIndex > count($this->_workSheetCollection) - 1) {
-            throw new PHPExcel_Exception("Sheet index is out of bounds.");
+
+        $numSheets = count($this->_workSheetCollection);
+
+        if ($pIndex > $numSheets - 1) {
+            throw new PHPExcel_Exception(
+            	"You tried to remove a sheet by the out of bounds index: {$pIndex}. The actual number of sheets is {$numSheets}."
+            );
         } else {
             array_splice($this->_workSheetCollection, $pIndex, 1);
         }
@@ -282,8 +289,13 @@ class PHPExcel
      */
     public function getSheet($pIndex = 0)
     {
-        if ($pIndex > count($this->_workSheetCollection) - 1) {
-            throw new PHPExcel_Exception("Sheet index is out of bounds.");
+
+        $numSheets = count($this->_workSheetCollection);
+
+        if ($pIndex > $numSheets - 1) {
+            throw new PHPExcel_Exception(
+            	"Your requested sheet index: {$pIndex} is out of bounds. The actual number of sheets is {$numSheets}."
+           	);
         } else {
             return $this->_workSheetCollection[$pIndex];
         }
@@ -389,8 +401,12 @@ class PHPExcel
      */
     public function setActiveSheetIndex($pIndex = 0)
     {
-        if ($pIndex > count($this->_workSheetCollection) - 1) {
-            throw new PHPExcel_Exception("Active sheet index is out of bounds.");
+    		$numSheets = count($this->_workSheetCollection);
+
+        if ($pIndex > $numSheets - 1) {
+            throw new PHPExcel_Exception(
+            	"You tried to set a sheet active by the out of bounds index: {$pIndex}. The actual number of sheets is {$numSheets}."
+            );
         } else {
             $this->_activeSheetIndex = $pIndex;
         }
diff --git a/Classes/PHPExcel/Comment.php b/Classes/PHPExcel/Comment.php
index cb84629..47db7ec 100644
--- a/Classes/PHPExcel/Comment.php
+++ b/Classes/PHPExcel/Comment.php
@@ -21,7 +21,7 @@
  * @category   PHPExcel
  * @package    PHPExcel
  * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
 
@@ -35,68 +35,68 @@
  */
 class PHPExcel_Comment implements PHPExcel_IComparable
 {
-	/**
-	 * Author
-	 *
-	 * @var string
-	 */
-	private $_author;
+    /**
+     * Author
+     *
+     * @var string
+     */
+    private $_author;
 
-	/**
-	 * Rich text comment
-	 *
-	 * @var PHPExcel_RichText
-	 */
-	private $_text;
+    /**
+     * Rich text comment
+     *
+     * @var PHPExcel_RichText
+     */
+    private $_text;
 
-	/**
-	 * Comment width (CSS style, i.e. XXpx or YYpt)
-	 *
-	 * @var string
-	 */
-	private $_width = '96pt';
+    /**
+     * Comment width (CSS style, i.e. XXpx or YYpt)
+     *
+     * @var string
+     */
+    private $_width = '96pt';
 
-	/**
-	 * Left margin (CSS style, i.e. XXpx or YYpt)
-	 *
-	 * @var string
-	 */
-	private $_marginLeft = '59.25pt';
+    /**
+     * Left margin (CSS style, i.e. XXpx or YYpt)
+     *
+     * @var string
+     */
+    private $_marginLeft = '59.25pt';
 
-	/**
-	 * Top margin (CSS style, i.e. XXpx or YYpt)
-	 *
-	 * @var string
-	 */
-	private $_marginTop = '1.5pt';
+    /**
+     * Top margin (CSS style, i.e. XXpx or YYpt)
+     *
+     * @var string
+     */
+    private $_marginTop = '1.5pt';
 
-	/**
-	 * Visible
-	 *
-	 * @var boolean
-	 */
-	private $_visible = false;
+    /**
+     * Visible
+     *
+     * @var boolean
+     */
+    private $_visible = false;
 
-	/**
-	 * Comment height (CSS style, i.e. XXpx or YYpt)
-	 *
-	 * @var string
-	 */
-	private $_height = '55.5pt';
+    /**
+     * Comment height (CSS style, i.e. XXpx or YYpt)
+     *
+     * @var string
+     */
+    private $_height = '55.5pt';
 
-	/**
-	 * Comment fill color
-	 *
-	 * @var PHPExcel_Style_Color
-	 */
-	private $_fillColor;
+    /**
+     * Comment fill color
+     *
+     * @var PHPExcel_Style_Color
+     */
+    private $_fillColor;
 
-	/**
-	 * Alignment
-	 *
-	 * @var string
-	 */
-	private $_alignment;
+    /**
+     * Alignment
+     *
+     * @var string
+     */
+    private $_alignment;
 
     /**
      * Create a new PHPExcel_Comment
@@ -105,11 +105,11 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      */
     public function __construct()
     {
-    	// Initialise variables
-    	$this->_author		= 'Author';
-    	$this->_text		= new PHPExcel_RichText();
-    	$this->_fillColor	= new PHPExcel_Style_Color('FFFFFFE1');
-		$this->_alignment	= PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
+        // Initialise variables
+        $this->_author        = 'Author';
+        $this->_text        = new PHPExcel_RichText();
+        $this->_fillColor    = new PHPExcel_Style_Color('FFFFFFE1');
+        $this->_alignment    = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
     }
 
     /**
@@ -118,7 +118,7 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      * @return string
      */
     public function getAuthor() {
-    	return $this->_author;
+        return $this->_author;
     }
 
     /**
@@ -127,10 +127,10 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      * @param string $pValue
      * @return PHPExcel_Comment
      */
-	public function setAuthor($pValue = '') {
-		$this->_author = $pValue;
-		return $this;
-	}
+    public function setAuthor($pValue = '') {
+        $this->_author = $pValue;
+        return $this;
+    }
 
     /**
      * Get Rich text comment
@@ -138,7 +138,7 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      * @return PHPExcel_RichText
      */
     public function getText() {
-    	return $this->_text;
+        return $this->_text;
     }
 
     /**
@@ -148,8 +148,8 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      * @return PHPExcel_Comment
      */
     public function setText(PHPExcel_RichText $pValue) {
-    	$this->_text = $pValue;
-    	return $this;
+        $this->_text = $pValue;
+        return $this;
     }
 
     /**
@@ -268,8 +268,8 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      * @return PHPExcel_Comment
      */
     public function setAlignment($pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL) {
-		$this->_alignment = $pValue;
-		return $this;
+        $this->_alignment = $pValue;
+        return $this;
     }
 
     /**
@@ -278,40 +278,40 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      * @return string
      */
     public function getAlignment() {
-		return $this->_alignment;
+        return $this->_alignment;
     }
 
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->_author
-    		. $this->_text->getHashCode()
-    		. $this->_width
-    		. $this->_height
-    		. $this->_marginLeft
-    		. $this->_marginTop
-    		. ($this->_visible ? 1 : 0)
-    		. $this->_fillColor->getHashCode()
-    		. $this->_alignment
-    		. __CLASS__
-    	);
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode() {
+        return md5(
+              $this->_author
+            . $this->_text->getHashCode()
+            . $this->_width
+            . $this->_height
+            . $this->_marginLeft
+            . $this->_marginTop
+            . ($this->_visible ? 1 : 0)
+            . $this->_fillColor->getHashCode()
+            . $this->_alignment
+            . __CLASS__
+        );
     }
 
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone() {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
 }
diff --git a/Classes/PHPExcel/DocumentProperties.php b/Classes/PHPExcel/DocumentProperties.php
index 6bde10f..952fa7d 100644
--- a/Classes/PHPExcel/DocumentProperties.php
+++ b/Classes/PHPExcel/DocumentProperties.php
@@ -18,571 +18,570 @@
  * 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
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
+ * @category    PHPExcel
+ * @package    PHPExcel
+ * @copyright    Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
  */
 
 
 /**
  * PHPExcel_DocumentProperties
  *
- * @category	PHPExcel
- * @package		PHPExcel
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @category    PHPExcel
+ * @package        PHPExcel
+ * @copyright    Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_DocumentProperties
 {
-	/** constants */
-	const PROPERTY_TYPE_BOOLEAN		= 'b';
-	const PROPERTY_TYPE_INTEGER		= 'i';
-	const PROPERTY_TYPE_FLOAT		= 'f';
-	const PROPERTY_TYPE_DATE		= 'd';
-	const PROPERTY_TYPE_STRING		= 's';
-	const PROPERTY_TYPE_UNKNOWN		= 'u';
+    /** constants */
+    const PROPERTY_TYPE_BOOLEAN	= 'b';
+    const PROPERTY_TYPE_INTEGER = 'i';
+    const PROPERTY_TYPE_FLOAT   = 'f';
+    const PROPERTY_TYPE_DATE    = 'd';
+    const PROPERTY_TYPE_STRING  = 's';
+    const PROPERTY_TYPE_UNKNOWN = 'u';
+
+    /**
+     * Creator
+     *
+     * @var string
+     */
+    private $_creator    = 'Unknown Creator';
+
+    /**
+     * LastModifiedBy
+     *
+     * @var string
+     */
+    private $_lastModifiedBy;
+
+    /**
+     * Created
+     *
+     * @var datetime
+     */
+    private $_created;
+
+    /**
+     * Modified
+     *
+     * @var datetime
+     */
+    private $_modified;
+
+    /**
+     * Title
+     *
+     * @var string
+     */
+    private $_title            = 'Untitled Spreadsheet';
+
+    /**
+     * Description
+     *
+     * @var string
+     */
+    private $_description    = '';
+
+    /**
+     * Subject
+     *
+     * @var string
+     */
+    private $_subject        = '';
+
+    /**
+     * Keywords
+     *
+     * @var string
+     */
+    private $_keywords        = '';
+
+    /**
+     * Category
+     *
+     * @var string
+     */
+    private $_category        = '';
+
+    /**
+     * Manager
+     *
+     * @var string
+     */
+    private $_manager        = '';
+
+    /**
+     * Company
+     *
+     * @var string
+     */
+    private $_company        = 'Microsoft Corporation';
+
+    /**
+     * Custom Properties
+     *
+     * @var string
+     */
+    private $_customProperties    = array();
 
 
-	/**
-	 * Creator
-	 *
-	 * @var	string
-	 */
-	private $_creator	= 'Unknown Creator';
+    /**
+     * Create a new PHPExcel_DocumentProperties
+     */
+    public function __construct()
+    {
+        // Initialise values
+        $this->_lastModifiedBy    = $this->_creator;
+        $this->_created        = time();
+        $this->_modified    = time();
+    }
 
-	/**
-	 * LastModifiedBy
-	 *
-	 * @var	string
-	 */
-	private $_lastModifiedBy;
+    /**
+     * Get Creator
+     *
+     * @return string
+     */
+    public function getCreator() {
+        return $this->_creator;
+    }
 
-	/**
-	 * Created
-	 *
-	 * @var	datetime
-	 */
-	private $_created;
+    /**
+     * Set Creator
+     *
+     * @param string $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setCreator($pValue = '') {
+        $this->_creator = $pValue;
+        return $this;
+    }
 
-	/**
-	 * Modified
-	 *
-	 * @var	datetime
-	 */
-	private $_modified;
+    /**
+     * Get Last Modified By
+     *
+     * @return string
+     */
+    public function getLastModifiedBy() {
+        return $this->_lastModifiedBy;
+    }
 
-	/**
-	 * Title
-	 *
-	 * @var	string
-	 */
-	private $_title			= 'Untitled Spreadsheet';
+    /**
+     * Set Last Modified By
+     *
+     * @param string $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setLastModifiedBy($pValue = '') {
+        $this->_lastModifiedBy = $pValue;
+        return $this;
+    }
 
-	/**
-	 * Description
-	 *
-	 * @var	string
-	 */
-	private $_description	= '';
+    /**
+     * Get Created
+     *
+     * @return datetime
+     */
+    public function getCreated() {
+        return $this->_created;
+    }
 
-	/**
-	 * Subject
-	 *
-	 * @var	string
-	 */
-	private $_subject		= '';
+    /**
+     * Set Created
+     *
+     * @param datetime $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setCreated($pValue = null) {
+        if ($pValue === NULL) {
+            $pValue = time();
+        } elseif (is_string($pValue)) {
+            if (is_numeric($pValue)) {
+                $pValue = intval($pValue);
+            } else {
+                $pValue = strtotime($pValue);
+            }
+        }
 
-	/**
-	 * Keywords
-	 *
-	 * @var	string
-	 */
-	private $_keywords		= '';
+        $this->_created = $pValue;
+        return $this;
+    }
 
-	/**
-	 * Category
-	 *
-	 * @var	string
-	 */
-	private $_category		= '';
+    /**
+     * Get Modified
+     *
+     * @return datetime
+     */
+    public function getModified() {
+        return $this->_modified;
+    }
 
-	/**
-	 * Manager
-	 *
-	 * @var	string
-	 */
-	private $_manager		= '';
+    /**
+     * Set Modified
+     *
+     * @param datetime $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setModified($pValue = null) {
+        if ($pValue === NULL) {
+            $pValue = time();
+        } elseif (is_string($pValue)) {
+            if (is_numeric($pValue)) {
+                $pValue = intval($pValue);
+            } else {
+                $pValue = strtotime($pValue);
+            }
+        }
 
-	/**
-	 * Company
-	 *
-	 * @var	string
-	 */
-	private $_company		= 'Microsoft Corporation';
+        $this->_modified = $pValue;
+        return $this;
+    }
 
-	/**
-	 * Custom Properties
-	 *
-	 * @var	string
-	 */
-	private $_customProperties	= array();
+    /**
+     * Get Title
+     *
+     * @return string
+     */
+    public function getTitle() {
+        return $this->_title;
+    }
 
+    /**
+     * Set Title
+     *
+     * @param string $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setTitle($pValue = '') {
+        $this->_title = $pValue;
+        return $this;
+    }
 
-	/**
-	 * Create a new PHPExcel_DocumentProperties
-	 */
-	public function __construct()
-	{
-		// Initialise values
-		$this->_lastModifiedBy	= $this->_creator;
-		$this->_created		= time();
-		$this->_modified	= time();
-	}
+    /**
+     * Get Description
+     *
+     * @return string
+     */
+    public function getDescription() {
+        return $this->_description;
+    }
 
-	/**
-	 * Get Creator
-	 *
-	 * @return	string
-	 */
-	public function getCreator() {
-		return $this->_creator;
-	}
+    /**
+     * Set Description
+     *
+     * @param string $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setDescription($pValue = '') {
+        $this->_description = $pValue;
+        return $this;
+    }
 
-	/**
-	 * Set Creator
-	 *
-	 * @param	string	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setCreator($pValue = '') {
-		$this->_creator = $pValue;
-		return $this;
-	}
+    /**
+     * Get Subject
+     *
+     * @return string
+     */
+    public function getSubject() {
+        return $this->_subject;
+    }
 
-	/**
-	 * Get Last Modified By
-	 *
-	 * @return	string
-	 */
-	public function getLastModifiedBy() {
-		return $this->_lastModifiedBy;
-	}
+    /**
+     * Set Subject
+     *
+     * @param string $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setSubject($pValue = '') {
+        $this->_subject = $pValue;
+        return $this;
+    }
 
-	/**
-	 * Set Last Modified By
-	 *
-	 * @param	string	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setLastModifiedBy($pValue = '') {
-		$this->_lastModifiedBy = $pValue;
-		return $this;
-	}
+    /**
+     * Get Keywords
+     *
+     * @return string
+     */
+    public function getKeywords() {
+        return $this->_keywords;
+    }
 
-	/**
-	 * Get Created
-	 *
-	 * @return	datetime
-	 */
-	public function getCreated() {
-		return $this->_created;
-	}
+    /**
+     * Set Keywords
+     *
+     * @param string $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setKeywords($pValue = '') {
+        $this->_keywords = $pValue;
+        return $this;
+    }
 
-	/**
-	 * Set Created
-	 *
-	 * @param	datetime	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setCreated($pValue = null) {
-		if ($pValue === NULL) {
-			$pValue = time();
-		} elseif (is_string($pValue)) {
-			if (is_numeric($pValue)) {
-				$pValue = intval($pValue);
-			} else {
-				$pValue = strtotime($pValue);
-			}
-		}
+    /**
+     * Get Category
+     *
+     * @return string
+     */
+    public function getCategory() {
+        return $this->_category;
+    }
 
-		$this->_created = $pValue;
-		return $this;
-	}
+    /**
+     * Set Category
+     *
+     * @param string $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setCategory($pValue = '') {
+        $this->_category = $pValue;
+        return $this;
+    }
 
-	/**
-	 * Get Modified
-	 *
-	 * @return	datetime
-	 */
-	public function getModified() {
-		return $this->_modified;
-	}
+    /**
+     * Get Company
+     *
+     * @return string
+     */
+    public function getCompany() {
+        return $this->_company;
+    }
 
-	/**
-	 * Set Modified
-	 *
-	 * @param	datetime	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setModified($pValue = null) {
-		if ($pValue === NULL) {
-			$pValue = time();
-		} elseif (is_string($pValue)) {
-			if (is_numeric($pValue)) {
-				$pValue = intval($pValue);
-			} else {
-				$pValue = strtotime($pValue);
-			}
-		}
+    /**
+     * Set Company
+     *
+     * @param string $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setCompany($pValue = '') {
+        $this->_company = $pValue;
+        return $this;
+    }
 
-		$this->_modified = $pValue;
-		return $this;
-	}
+    /**
+     * Get Manager
+     *
+     * @return string
+     */
+    public function getManager() {
+        return $this->_manager;
+    }
 
-	/**
-	 * Get Title
-	 *
-	 * @return	string
-	 */
-	public function getTitle() {
-		return $this->_title;
-	}
+    /**
+     * Set Manager
+     *
+     * @param string $pValue
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setManager($pValue = '') {
+        $this->_manager = $pValue;
+        return $this;
+    }
 
-	/**
-	 * Set Title
-	 *
-	 * @param	string	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setTitle($pValue = '') {
-		$this->_title = $pValue;
-		return $this;
-	}
+    /**
+     * Get a List of Custom Property Names
+     *
+     * @return array of string
+     */
+    public function getCustomProperties() {
+        return array_keys($this->_customProperties);
+    }
 
-	/**
-	 * Get Description
-	 *
-	 * @return	string
-	 */
-	public function getDescription() {
-		return $this->_description;
-	}
+    /**
+     * Check if a Custom Property is defined
+     *
+     * @param string $propertyName
+     * @return boolean
+     */
+    public function isCustomPropertySet($propertyName) {
+        return isset($this->_customProperties[$propertyName]);
+    }
 
-	/**
-	 * Set Description
-	 *
-	 * @param	string	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setDescription($pValue = '') {
-		$this->_description = $pValue;
-		return $this;
-	}
+    /**
+     * Get a Custom Property Value
+     *
+     * @param string $propertyName
+     * @return string
+     */
+    public function getCustomPropertyValue($propertyName) {
+        if (isset($this->_customProperties[$propertyName])) {
+            return $this->_customProperties[$propertyName]['value'];
+        }
 
-	/**
-	 * Get Subject
-	 *
-	 * @return	string
-	 */
-	public function getSubject() {
-		return $this->_subject;
-	}
+    }
 
-	/**
-	 * Set Subject
-	 *
-	 * @param	string	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setSubject($pValue = '') {
-		$this->_subject = $pValue;
-		return $this;
-	}
+    /**
+     * Get a Custom Property Type
+     *
+     * @param string $propertyName
+     * @return string
+     */
+    public function getCustomPropertyType($propertyName) {
+        if (isset($this->_customProperties[$propertyName])) {
+            return $this->_customProperties[$propertyName]['type'];
+        }
 
-	/**
-	 * Get Keywords
-	 *
-	 * @return	string
-	 */
-	public function getKeywords() {
-		return $this->_keywords;
-	}
+    }
 
-	/**
-	 * Set Keywords
-	 *
-	 * @param	string	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setKeywords($pValue = '') {
-		$this->_keywords = $pValue;
-		return $this;
-	}
+    /**
+     * Set a Custom Property
+     *
+     * @param string $propertyName
+     * @param mixed $propertyValue
+     * @param string $propertyType
+     * 	 'i'    : Integer
+     *   'f' : Floating Point
+     *   's' : String
+     *   'd' : Date/Time
+     *   'b' : Boolean
+     * @return PHPExcel_DocumentProperties
+     */
+    public function setCustomProperty($propertyName,$propertyValue='',$propertyType=NULL) {
+        if (($propertyType === NULL) || (!in_array($propertyType,array(self::PROPERTY_TYPE_INTEGER,
+                                                                       self::PROPERTY_TYPE_FLOAT,
+                                                                       self::PROPERTY_TYPE_STRING,
+                                                                       self::PROPERTY_TYPE_DATE,
+                                                                       self::PROPERTY_TYPE_BOOLEAN)))) {
+            if ($propertyValue === NULL) {
+                $propertyType = self::PROPERTY_TYPE_STRING;
+            } elseif (is_float($propertyValue)) {
+                $propertyType = self::PROPERTY_TYPE_FLOAT;
+            } elseif(is_int($propertyValue)) {
+                $propertyType = self::PROPERTY_TYPE_INTEGER;
+            } elseif (is_bool($propertyValue)) {
+                $propertyType = self::PROPERTY_TYPE_BOOLEAN;
+            } else {
+                $propertyType = self::PROPERTY_TYPE_STRING;
+            }
+        }
 
-	/**
-	 * Get Category
-	 *
-	 * @return	string
-	 */
-	public function getCategory() {
-		return $this->_category;
-	}
+        $this->_customProperties[$propertyName] = array('value' => $propertyValue, 'type' => $propertyType);
+        return $this;
+    }
 
-	/**
-	 * Set Category
-	 *
-	 * @param	string	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setCategory($pValue = '') {
-		$this->_category = $pValue;
-		return $this;
-	}
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone() {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
 
-	/**
-	 * Get Company
-	 *
-	 * @return	string
-	 */
-	public function getCompany() {
-		return $this->_company;
-	}
+    public static function convertProperty($propertyValue,$propertyType) {
+        switch ($propertyType) {
+            case 'empty'    :    //    Empty
+                return '';
+                break;
+            case 'null'        :    //    Null
+                return NULL;
+                break;
+            case 'i1'        :    //    1-Byte Signed Integer
+            case 'i2'        :    //    2-Byte Signed Integer
+            case 'i4'        :    //    4-Byte Signed Integer
+            case 'i8'        :    //    8-Byte Signed Integer
+            case 'int'        :    //    Integer
+                return (int) $propertyValue;
+                break;
+            case 'ui1'        :    //    1-Byte Unsigned Integer
+            case 'ui2'        :    //    2-Byte Unsigned Integer
+            case 'ui4'        :    //    4-Byte Unsigned Integer
+            case 'ui8'        :    //    8-Byte Unsigned Integer
+            case 'uint'        :    //    Unsigned Integer
+                return abs((int) $propertyValue);
+                break;
+            case 'r4'        :    //    4-Byte Real Number
+            case 'r8'        :    //    8-Byte Real Number
+            case 'decimal'    :    //    Decimal
+                return (float) $propertyValue;
+                break;
+            case 'lpstr'    :    //    LPSTR
+            case 'lpwstr'    :    //    LPWSTR
+            case 'bstr'        :    //    Basic String
+                return $propertyValue;
+                break;
+            case 'date'        :    //    Date and Time
+            case 'filetime'    :    //    File Time
+                return strtotime($propertyValue);
+                break;
+            case 'bool'        :    //    Boolean
+                return ($propertyValue == 'true') ? True : False;
+                break;
+            case 'cy'        :    //    Currency
+            case 'error'    :    //    Error Status Code
+            case 'vector'    :    //    Vector
+            case 'array'    :    //    Array
+            case 'blob'        :    //    Binary Blob
+            case 'oblob'    :    //    Binary Blob Object
+            case 'stream'    :    //    Binary Stream
+            case 'ostream'    :    //    Binary Stream Object
+            case 'storage'    :    //    Binary Storage
+            case 'ostorage'    :    //    Binary Storage Object
+            case 'vstream'    :    //    Binary Versioned Stream
+            case 'clsid'    :    //    Class ID
+            case 'cf'        :    //    Clipboard Data
+                return $propertyValue;
+                break;
+        }
+        return $propertyValue;
+    }
 
-	/**
-	 * Set Company
-	 *
-	 * @param	string	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setCompany($pValue = '') {
-		$this->_company = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get Manager
-	 *
-	 * @return	string
-	 */
-	public function getManager() {
-		return $this->_manager;
-	}
-
-	/**
-	 * Set Manager
-	 *
-	 * @param	string	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setManager($pValue = '') {
-		$this->_manager = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get a List of Custom Property Names
-	 *
-	 * @return	array of string
-	 */
-	public function getCustomProperties() {
-		return array_keys($this->_customProperties);
-	}
-
-	/**
-	 * Check if a Custom Property is defined
-	 *
-	 * @param	string	$propertyName
-	 * @return	boolean
-	 */
-	public function isCustomPropertySet($propertyName) {
-		return isset($this->_customProperties[$propertyName]);
-	}
-
-	/**
-	 * Get a Custom Property Value
-	 *
-	 * @param	string	$propertyName
-	 * @return	string
-	 */
-	public function getCustomPropertyValue($propertyName) {
-		if (isset($this->_customProperties[$propertyName])) {
-			return $this->_customProperties[$propertyName]['value'];
-		}
-
-	}
-
-	/**
-	 * Get a Custom Property Type
-	 *
-	 * @param	string	$propertyName
-	 * @return	string
-	 */
-	public function getCustomPropertyType($propertyName) {
-		if (isset($this->_customProperties[$propertyName])) {
-			return $this->_customProperties[$propertyName]['type'];
-		}
-
-	}
-
-	/**
-	 * Set a Custom Property
-	 *
-	 * @param	string	$propertyName
-	 * @param	mixed	$propertyValue
-	 * @param	string	$propertyType
-	 *						'i'	: Integer
-	 *						'f' : Floating Point
-	 *						's' : String
-	 *						'd' : Date/Time
-	 *						'b' : Boolean
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setCustomProperty($propertyName,$propertyValue='',$propertyType=NULL) {
-		if (($propertyType === NULL) || (!in_array($propertyType,array(self::PROPERTY_TYPE_INTEGER,
-																	   self::PROPERTY_TYPE_FLOAT,
-																	   self::PROPERTY_TYPE_STRING,
-																	   self::PROPERTY_TYPE_DATE,
-																	   self::PROPERTY_TYPE_BOOLEAN)))) {
-			if ($propertyValue === NULL) {
-				$propertyType = self::PROPERTY_TYPE_STRING;
-			} elseif (is_float($propertyValue)) {
-				$propertyType = self::PROPERTY_TYPE_FLOAT;
-			} elseif(is_int($propertyValue)) {
-				$propertyType = self::PROPERTY_TYPE_INTEGER;
-			} elseif (is_bool($propertyValue)) {
-				$propertyType = self::PROPERTY_TYPE_BOOLEAN;
-			} else {
-				$propertyType = self::PROPERTY_TYPE_STRING;
-			}
-		}
-
-		$this->_customProperties[$propertyName] = array('value' => $propertyValue, 'type' => $propertyType);
-		return $this;
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-
-	public static function convertProperty($propertyValue,$propertyType) {
-		switch ($propertyType) {
-			case 'empty'	:	//	Empty
-				return '';
-				break;
-			case 'null'		:	//	Null
-				return NULL;
-				break;
-			case 'i1'		:	//	1-Byte Signed Integer
-			case 'i2'		:	//	2-Byte Signed Integer
-			case 'i4'		:	//	4-Byte Signed Integer
-			case 'i8'		:	//	8-Byte Signed Integer
-			case 'int'		:	//	Integer
-				return (int) $propertyValue;
-				break;
-			case 'ui1'		:	//	1-Byte Unsigned Integer
-			case 'ui2'		:	//	2-Byte Unsigned Integer
-			case 'ui4'		:	//	4-Byte Unsigned Integer
-			case 'ui8'		:	//	8-Byte Unsigned Integer
-			case 'uint'		:	//	Unsigned Integer
-				return abs((int) $propertyValue);
-				break;
-			case 'r4'		:	//	4-Byte Real Number
-			case 'r8'		:	//	8-Byte Real Number
-			case 'decimal'	:	//	Decimal
-				return (float) $propertyValue;
-				break;
-			case 'lpstr'	:	//	LPSTR
-			case 'lpwstr'	:	//	LPWSTR
-			case 'bstr'		:	//	Basic String
-				return $propertyValue;
-				break;
-			case 'date'		:	//	Date and Time
-			case 'filetime'	:	//	File Time
-				return strtotime($propertyValue);
-				break;
-			case 'bool'		:	//	Boolean
-				return ($propertyValue == 'true') ? True : False;
-				break;
-			case 'cy'		:	//	Currency
-			case 'error'	:	//	Error Status Code
-			case 'vector'	:	//	Vector
-			case 'array'	:	//	Array
-			case 'blob'		:	//	Binary Blob
-			case 'oblob'	:	//	Binary Blob Object
-			case 'stream'	:	//	Binary Stream
-			case 'ostream'	:	//	Binary Stream Object
-			case 'storage'	:	//	Binary Storage
-			case 'ostorage'	:	//	Binary Storage Object
-			case 'vstream'	:	//	Binary Versioned Stream
-			case 'clsid'	:	//	Class ID
-			case 'cf'		:	//	Clipboard Data
-				return $propertyValue;
-				break;
-		}
-		return $propertyValue;
-	}
-
-	public static function convertPropertyType($propertyType) {
-		switch ($propertyType) {
-			case 'i1'		:	//	1-Byte Signed Integer
-			case 'i2'		:	//	2-Byte Signed Integer
-			case 'i4'		:	//	4-Byte Signed Integer
-			case 'i8'		:	//	8-Byte Signed Integer
-			case 'int'		:	//	Integer
-			case 'ui1'		:	//	1-Byte Unsigned Integer
-			case 'ui2'		:	//	2-Byte Unsigned Integer
-			case 'ui4'		:	//	4-Byte Unsigned Integer
-			case 'ui8'		:	//	8-Byte Unsigned Integer
-			case 'uint'		:	//	Unsigned Integer
-				return self::PROPERTY_TYPE_INTEGER;
-				break;
-			case 'r4'		:	//	4-Byte Real Number
-			case 'r8'		:	//	8-Byte Real Number
-			case 'decimal'	:	//	Decimal
-				return self::PROPERTY_TYPE_FLOAT;
-				break;
-			case 'empty'	:	//	Empty
-			case 'null'		:	//	Null
-			case 'lpstr'	:	//	LPSTR
-			case 'lpwstr'	:	//	LPWSTR
-			case 'bstr'		:	//	Basic String
-				return self::PROPERTY_TYPE_STRING;
-				break;
-			case 'date'		:	//	Date and Time
-			case 'filetime'	:	//	File Time
-				return self::PROPERTY_TYPE_DATE;
-				break;
-			case 'bool'		:	//	Boolean
-				return self::PROPERTY_TYPE_BOOLEAN;
-				break;
-			case 'cy'		:	//	Currency
-			case 'error'	:	//	Error Status Code
-			case 'vector'	:	//	Vector
-			case 'array'	:	//	Array
-			case 'blob'		:	//	Binary Blob
-			case 'oblob'	:	//	Binary Blob Object
-			case 'stream'	:	//	Binary Stream
-			case 'ostream'	:	//	Binary Stream Object
-			case 'storage'	:	//	Binary Storage
-			case 'ostorage'	:	//	Binary Storage Object
-			case 'vstream'	:	//	Binary Versioned Stream
-			case 'clsid'	:	//	Class ID
-			case 'cf'		:	//	Clipboard Data
-				return self::PROPERTY_TYPE_UNKNOWN;
-				break;
-		}
-		return self::PROPERTY_TYPE_UNKNOWN;
-	}
+    public static function convertPropertyType($propertyType) {
+        switch ($propertyType) {
+            case 'i1'        :    //    1-Byte Signed Integer
+            case 'i2'        :    //    2-Byte Signed Integer
+            case 'i4'        :    //    4-Byte Signed Integer
+            case 'i8'        :    //    8-Byte Signed Integer
+            case 'int'        :    //    Integer
+            case 'ui1'        :    //    1-Byte Unsigned Integer
+            case 'ui2'        :    //    2-Byte Unsigned Integer
+            case 'ui4'        :    //    4-Byte Unsigned Integer
+            case 'ui8'        :    //    8-Byte Unsigned Integer
+            case 'uint'        :    //    Unsigned Integer
+                return self::PROPERTY_TYPE_INTEGER;
+                break;
+            case 'r4'        :    //    4-Byte Real Number
+            case 'r8'        :    //    8-Byte Real Number
+            case 'decimal'    :    //    Decimal
+                return self::PROPERTY_TYPE_FLOAT;
+                break;
+            case 'empty'    :    //    Empty
+            case 'null'        :    //    Null
+            case 'lpstr'    :    //    LPSTR
+            case 'lpwstr'    :    //    LPWSTR
+            case 'bstr'        :    //    Basic String
+                return self::PROPERTY_TYPE_STRING;
+                break;
+            case 'date'        :    //    Date and Time
+            case 'filetime'    :    //    File Time
+                return self::PROPERTY_TYPE_DATE;
+                break;
+            case 'bool'        :    //    Boolean
+                return self::PROPERTY_TYPE_BOOLEAN;
+                break;
+            case 'cy'        :    //    Currency
+            case 'error'    :    //    Error Status Code
+            case 'vector'    :    //    Vector
+            case 'array'    :    //    Array
+            case 'blob'        :    //    Binary Blob
+            case 'oblob'    :    //    Binary Blob Object
+            case 'stream'    :    //    Binary Stream
+            case 'ostream'    :    //    Binary Stream Object
+            case 'storage'    :    //    Binary Storage
+            case 'ostorage'    :    //    Binary Storage Object
+            case 'vstream'    :    //    Binary Versioned Stream
+            case 'clsid'    :    //    Class ID
+            case 'cf'        :    //    Clipboard Data
+                return self::PROPERTY_TYPE_UNKNOWN;
+                break;
+        }
+        return self::PROPERTY_TYPE_UNKNOWN;
+    }
 
 }
diff --git a/Classes/PHPExcel/Exception.php b/Classes/PHPExcel/Exception.php
index a435453..8ac5386 100644
--- a/Classes/PHPExcel/Exception.php
+++ b/Classes/PHPExcel/Exception.php
@@ -21,8 +21,8 @@
  * @category   PHPExcel
  * @package    PHPExcel
  * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    ##VERSION##, ##DATE##
  */
 
 
@@ -34,19 +34,19 @@
  * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Exception extends Exception {
-	/**
-	 * Error handler callback
-	 *
-	 * @param mixed $code
-	 * @param mixed $string
-	 * @param mixed $file
-	 * @param mixed $line
-	 * @param mixed $context
-	 */
-	public static function errorHandlerCallback($code, $string, $file, $line, $context) {
-		$e = new self($string, $code);
-		$e->line = $line;
-		$e->file = $file;
-		throw $e;
-	}
+    /**
+     * Error handler callback
+     *
+     * @param mixed $code
+     * @param mixed $string
+     * @param mixed $file
+     * @param mixed $line
+     * @param mixed $context
+     */
+    public static function errorHandlerCallback($code, $string, $file, $line, $context) {
+        $e = new self($string, $code);
+        $e->line = $line;
+        $e->file = $file;
+        throw $e;
+    }
 }
diff --git a/Classes/PHPExcel/Shared/OLERead.php b/Classes/PHPExcel/Shared/OLERead.php
index 0ce44e4..5319370 100644
--- a/Classes/PHPExcel/Shared/OLERead.php
+++ b/Classes/PHPExcel/Shared/OLERead.php
@@ -252,19 +252,22 @@ class PHPExcel_Shared_OLERead {
 
 			$name = str_replace("\x00", "", substr($d,0,$nameSize));
 
+
 			$this->props[] = array (
 				'name' => $name,
 				'type' => $type,
 				'startBlock' => $startBlock,
 				'size' => $size);
 
+			// tmp helper to simplify checks
+			$upName = strtoupper($name);
+
 			// Workbook directory entry (BIFF5 uses Book, BIFF8 uses Workbook)
-			if (($name == 'Workbook') || ($name == 'Book') || ($name == 'WORKBOOK') || ($name == 'BOOK')) {
+			if (($upName === 'WORKBOOK') || ($upName === 'BOOK')) {
 				$this->wrkbook = count($this->props) - 1;
 			}
-
-			// Root entry
-			if ($name == 'Root Entry' || $name == 'ROOT ENTRY' || $name == 'R') {
+			else if ( $upName === 'ROOT ENTRY' || $upName === 'R') {
+				// Root entry
 				$this->rootentry = count($this->props) - 1;
 			}