diff --git a/Classes/PHPExcel/Writer/Excel5/Worksheet.php b/Classes/PHPExcel/Writer/Excel5/Worksheet.php
index fb75499b1..d135bb849 100644
--- a/Classes/PHPExcel/Writer/Excel5/Worksheet.php
+++ b/Classes/PHPExcel/Writer/Excel5/Worksheet.php
@@ -2856,16 +2856,18 @@ private function _writeDataValidity()
 					case PHPExcel_Cell_DataValidation::TYPE_TIME:		$type = 0x05;	break;
 					case PHPExcel_Cell_DataValidation::TYPE_TEXTLENGTH:	$type = 0x06;	break;
 					case PHPExcel_Cell_DataValidation::TYPE_CUSTOM:		$type = 0x07;	break;
+                    default: $type = 0x00;    break;
 				}
 				$options |= $type << 0;
 
 				// error style
-				$errorStyle = $dataValidation->getType();
+				$errorStyle = $dataValidation->getErrorStyle();
 				switch ($errorStyle) {
 					case PHPExcel_Cell_DataValidation::STYLE_STOP:			$errorStyle = 0x00;		break;
 					case PHPExcel_Cell_DataValidation::STYLE_WARNING:		$errorStyle = 0x01;		break;
 					case PHPExcel_Cell_DataValidation::STYLE_INFORMATION:	$errorStyle = 0x02;		break;
-				}
+                    default: $errorStyle = 0x00;    break;
+                }
 				$options |= $errorStyle << 4;
 
 				// explicit formula?
@@ -2896,7 +2898,8 @@ private function _writeDataValidity()
 					case PHPExcel_Cell_DataValidation::OPERATOR_LESSTHAN: $operator = 0x05			;	break;
 					case PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHANOREQUAL: $operator = 0x06;	break;
 					case PHPExcel_Cell_DataValidation::OPERATOR_LESSTHANOREQUAL: $operator = 0x07	;	break;
-				}
+                    default: $operator = 0x00;    break;
+                }
 				$options |= $operator << 20;
 
 				$data		= pack('V', $options);
diff --git a/composer.json b/composer.json
index ff18cb842..d906031c7 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "phpoffice/phpexcel",
+    "name": "eaglewu/phpexcel",
     "description": "PHPExcel - OpenXML - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
     "keywords": ["PHP","Excel","OpenXML","xlsx","xls","spreadsheet"],
     "homepage": "http://phpexcel.codeplex.com",