diff --git a/Documentation/Examples/Calculations/Database/DAVERAGE.php b/Documentation/Examples/Calculations/Database/DAVERAGE.php
index 387e1a93..adf4636c 100644
--- a/Documentation/Examples/Calculations/Database/DAVERAGE.php
+++ b/Documentation/Examples/Calculations/Database/DAVERAGE.php
@@ -16,15 +16,14 @@ date_default_timezone_set('Europe/London');
 </head>
 <body>
 
-<h1>PHPExcel Calculation Example</h1>
-<h2>Database Formulae</h2>
-<h3>DAVERAGE</h3>
+<h1>DAVERAGE</h1>
+<h2>Returns the average of selected database entries.</h2>
 <?php
 
 /** Include path **/
 set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
 
-/** PHPExcel_IOFactory */
+/** Include PHPExcel */
 include 'PHPExcel.php';
 
 
diff --git a/Documentation/Examples/Calculations/Database/DCOUNT.php b/Documentation/Examples/Calculations/Database/DCOUNT.php
index bc2a1dfa..ece2b1f3 100644
--- a/Documentation/Examples/Calculations/Database/DCOUNT.php
+++ b/Documentation/Examples/Calculations/Database/DCOUNT.php
@@ -16,15 +16,14 @@ date_default_timezone_set('Europe/London');
 </head>
 <body>
 
-<h1>PHPExcel Calculation Example </h1>
-<h2>Database Formulae</h2>
-<h3>DCOUNT</h3>
+<h1>DCOUNT</h1>
+<h2>Counts the cells that contain numbers in a database.</h2>
 <?php
 
 /** Include path **/
 set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
 
-/** PHPExcel_IOFactory */
+/** Include PHPExcel */
 include 'PHPExcel.php';
 
 
diff --git a/Documentation/Examples/Calculations/Database/DMAX.php b/Documentation/Examples/Calculations/Database/DMAX.php
index c416e0b1..1a2d22a4 100644
--- a/Documentation/Examples/Calculations/Database/DMAX.php
+++ b/Documentation/Examples/Calculations/Database/DMAX.php
@@ -16,15 +16,14 @@ date_default_timezone_set('Europe/London');
 </head>
 <body>
 
-<h1>PHPExcel Calculation Example </h1>
-<h2>Database Formulae</h2>
-<h3>DMAX</h3>
+<h1>DMAX</h1>
+<h2>Returns the maximum value from selected database entries.</h2>
 <?php
 
 /** Include path **/
 set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
 
-/** PHPExcel_IOFactory */
+/** Include PHPExcel */
 include 'PHPExcel.php';
 
 
diff --git a/Documentation/Examples/Calculations/Database/DMIN.php b/Documentation/Examples/Calculations/Database/DMIN.php
index 4b26f79b..d6f23a6a 100644
--- a/Documentation/Examples/Calculations/Database/DMIN.php
+++ b/Documentation/Examples/Calculations/Database/DMIN.php
@@ -16,15 +16,14 @@ date_default_timezone_set('Europe/London');
 </head>
 <body>
 
-<h1>PHPExcel Calculation Example </h1>
-<h2>Database Formulae</h2>
-<h3>DMIN</h3>
+<h1>DMIN</h1>
+<h2>Returns the minimum value from selected database entries.</h2>
 <?php
 
 /** Include path **/
 set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
 
-/** PHPExcel_IOFactory */
+/** Include PHPExcel */
 include 'PHPExcel.php';
 
 
diff --git a/Documentation/Examples/Calculations/Database/DSTDEV.php b/Documentation/Examples/Calculations/Database/DSTDEV.php
index 97de5c8d..c26df0e9 100644
--- a/Documentation/Examples/Calculations/Database/DSTDEV.php
+++ b/Documentation/Examples/Calculations/Database/DSTDEV.php
@@ -16,15 +16,14 @@ date_default_timezone_set('Europe/London');
 </head>
 <body>
 
-<h1>PHPExcel Calculation Example</h1>
-<h2>Database Formulae</h2>
-<h3>DSTDEV</h3>
+<h1>DSTDEV</h1>
+<h2>Estimates the standard deviation based on a sample of selected database entries.</h2>
 <?php
 
 /** Include path **/
 set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
 
-/** PHPExcel_IOFactory */
+/** Include PHPExcel */
 include 'PHPExcel.php';
 
 
diff --git a/Documentation/Examples/Calculations/Database/DSTDEVP.php b/Documentation/Examples/Calculations/Database/DSTDEVP.php
index 96cd77b0..9b353454 100644
--- a/Documentation/Examples/Calculations/Database/DSTDEVP.php
+++ b/Documentation/Examples/Calculations/Database/DSTDEVP.php
@@ -16,15 +16,14 @@ date_default_timezone_set('Europe/London');
 </head>
 <body>
 
-<h1>PHPExcel Calculation Example</h1>
-<h2>Database Formulae</h2>
-<h3>DSTDEVP</h3>
+<h1>DSTDEVP</h1>
+<h2>Calculates the standard deviation based on the entire population of selected database entries.</h2>
 <?php
 
 /** Include path **/
 set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
 
-/** PHPExcel_IOFactory */
+/** Include PHPExcel */
 include 'PHPExcel.php';
 
 
diff --git a/Documentation/Examples/Calculations/Database/DVAR.php b/Documentation/Examples/Calculations/Database/DVAR.php
index 13790694..e425f776 100644
--- a/Documentation/Examples/Calculations/Database/DVAR.php
+++ b/Documentation/Examples/Calculations/Database/DVAR.php
@@ -16,15 +16,14 @@ date_default_timezone_set('Europe/London');
 </head>
 <body>
 
-<h1>PHPExcel Calculation Example</h1>
-<h2>Database Formulae</h2>
-<h3>DVAR</h3>
+<h1>DVAR</h1>
+<h2>Estimates variance based on a sample from selected database entries.</h2>
 <?php
 
 /** Include path **/
 set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
 
-/** PHPExcel_IOFactory */
+/** Include PHPExcel */
 include 'PHPExcel.php';
 
 
diff --git a/Documentation/Examples/Calculations/Database/DVARP.php b/Documentation/Examples/Calculations/Database/DVARP.php
index a1512f33..e1cfc8e3 100644
--- a/Documentation/Examples/Calculations/Database/DVARP.php
+++ b/Documentation/Examples/Calculations/Database/DVARP.php
@@ -16,15 +16,14 @@ date_default_timezone_set('Europe/London');
 </head>
 <body>
 
-<h1>PHPExcel Calculation Example</h1>
-<h2>Database Formulae</h2>
-<h3>DVARP</h3>
+<h1>DVARP</h1>
+<h2>Calculates variance based on the entire population of selected database entries,</h2>
 <?php
 
 /** Include path **/
 set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
 
-/** PHPExcel_IOFactory */
+/** Include PHPExcel */
 include 'PHPExcel.php';
 
 
diff --git a/Documentation/Examples/Calculations/DateTime/DATE.php b/Documentation/Examples/Calculations/DateTime/DATE.php
index 431b267b..979d1f5e 100644
--- a/Documentation/Examples/Calculations/DateTime/DATE.php
+++ b/Documentation/Examples/Calculations/DateTime/DATE.php
@@ -16,15 +16,14 @@ date_default_timezone_set('Europe/London');
 </head>
 <body>
 
-<h1>PHPExcel Calculation Example</h1>
-<h2>Data/Time Formulae</h2>
-<h3>DATE</h3>
+<h1>DATE</h1>
+<h2>Returns the serial number of a particular date.</h2>
 <?php
 
 /** Include path **/
 set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
 
-/** PHPExcel_IOFactory */
+/** Include PHPExcel */
 include 'PHPExcel.php';
 
 
diff --git a/Documentation/Examples/Calculations/DateTime/DATEVALUE.php b/Documentation/Examples/Calculations/DateTime/DATEVALUE.php
index 3af84ab0..4d5d8c26 100644
--- a/Documentation/Examples/Calculations/DateTime/DATEVALUE.php
+++ b/Documentation/Examples/Calculations/DateTime/DATEVALUE.php
@@ -16,15 +16,14 @@ date_default_timezone_set('Europe/London');
 </head>
 <body>
 
-<h1>PHPExcel Calculation Example</h1>
-<h2>Data/Time Formulae</h2>
-<h3>DATEVALUE</h3>
+<h1>DATEVALUE</h1>
+<h2>Converts a date in the form of text to a serial number.</h2>
 <?php
 
 /** Include path **/
 set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
 
-/** PHPExcel_IOFactory */
+/** Include PHPExcel */
 include 'PHPExcel.php';
 
 
diff --git a/Documentation/Examples/Calculations/DateTime/TIME.php b/Documentation/Examples/Calculations/DateTime/TIME.php
index d6566cb7..f4522768 100644
--- a/Documentation/Examples/Calculations/DateTime/TIME.php
+++ b/Documentation/Examples/Calculations/DateTime/TIME.php
@@ -16,15 +16,14 @@ date_default_timezone_set('Europe/London');
 </head>
 <body>
 
-<h1>PHPExcel Calculation Example</h1>
-<h2>Data/Time Formulae</h2>
-<h3>TIME</h3>
+<h1>TIME</h1>
+<h2>Returns the serial number of a particular time.</h2>
 <?php
 
 /** Include path **/
 set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
 
-/** PHPExcel_IOFactory */
+/** Include PHPExcel */
 include 'PHPExcel.php';
 
 
diff --git a/Documentation/Examples/Calculations/DateTime/TIMEVALUE.php b/Documentation/Examples/Calculations/DateTime/TIMEVALUE.php
index d7ed2cd9..89e0ba49 100644
--- a/Documentation/Examples/Calculations/DateTime/TIMEVALUE.php
+++ b/Documentation/Examples/Calculations/DateTime/TIMEVALUE.php
@@ -16,15 +16,14 @@ date_default_timezone_set('Europe/London');
 </head>
 <body>
 
-<h1>PHPExcel Calculation Example</h1>
-<h2>Data/Time Formulae</h2>
-<h3>TIMEVALUE</h3>
+<h1>TIMEVALUE</h1>
+<h2>Converts a time in the form of text to a serial number.</h2>
 <?php
 
 /** Include path **/
 set_include_path(get_include_path() . PATH_SEPARATOR . '../../../../Classes/');
 
-/** PHPExcel_IOFactory */
+/** Include PHPExcel */
 include 'PHPExcel.php';
 
 
diff --git a/Documentation/Examples/Calculations/index.php b/Documentation/Examples/Calculations/index.php
new file mode 100644
index 00000000..f0905530
--- /dev/null
+++ b/Documentation/Examples/Calculations/index.php
@@ -0,0 +1,51 @@
+<?php
+
+error_reporting(E_ALL);
+set_time_limit(0);
+
+date_default_timezone_set('Europe/London');
+
+?>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+<title>PHPExcel Calculation Function Examples</title>
+
+</head>
+<body>
+
+<?php
+
+echo '<h1>PHPExcel Calculation Function Examples</h1>';
+
+$exampleTypeList = glob('./*',GLOB_ONLYDIR);
+
+foreach($exampleTypeList as $exampleType) {
+
+	echo '<h2>' . pathinfo($exampleType,PATHINFO_BASENAME) . ' Function Examples</h2>';
+
+	$exampleList = glob('./'.$exampleType.'/*.php');
+
+	foreach($exampleList as $exampleFile) {
+		$fileData = file_get_contents($exampleFile);
+
+		$h1Pattern = '#<h1>(.*?)</h1>#';
+		$h2Pattern = '#<h2>(.*?)</h2>#';
+
+		if (preg_match($h1Pattern, $fileData, $out)) {
+			$h1Text = $out[1];
+			$h2Text = (preg_match($h2Pattern, $fileData, $out)) ? $out[1] : '';
+
+			echo '<a href="',$exampleFile,'">',$h1Text,'</a><br />';
+			if ($h2Text > '') {
+				echo $h2Text,'<br />';
+			}
+		}
+
+	}
+}
+
+?>
+<body>
+</html>
\ No newline at end of file
diff --git a/Documentation/Examples/Reader/exampleReader14.php b/Documentation/Examples/Reader/exampleReader14.php
index b8a2b6d1..bef1916c 100644
--- a/Documentation/Examples/Reader/exampleReader14.php
+++ b/Documentation/Examples/Reader/exampleReader14.php
@@ -10,7 +10,7 @@
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #15</h1>
+<h1>PHPExcel Reader Example #14</h1>
 <h2>Reading a Large CSV file in "Chunks" to split across multiple Worksheets</h2>
 <?php
 
diff --git a/Documentation/Examples/Reader/exampleReader17.php b/Documentation/Examples/Reader/exampleReader17.php
index 6c8d1bd2..1f77c561 100644
--- a/Documentation/Examples/Reader/exampleReader17.php
+++ b/Documentation/Examples/Reader/exampleReader17.php
@@ -10,12 +10,12 @@ date_default_timezone_set('Europe/London');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-<title>PHPExcel Reader Example #08</title>
+<title>PHPExcel Reader Example #17</title>
 
 </head>
 <body>
 
-<h1>PHPExcel Reader Example #08</h1>
+<h1>PHPExcel Reader Example #17</h1>
 <h2>Simple File Reader Loading Several Named WorkSheets</h2>
 <?php
 
diff --git a/Documentation/Examples/index.php b/Documentation/Examples/index.php
index d85588cc..f657a7ac 100644
--- a/Documentation/Examples/index.php
+++ b/Documentation/Examples/index.php
@@ -21,7 +21,7 @@ $exampleTypeList = glob('./*',GLOB_ONLYDIR);
 
 foreach($exampleTypeList as $exampleType) {
 
-	echo '<h1>PHPExcel '.pathinfo($exampleType,PATHINFO_BASENAME).' Examples</h1>';
+	echo '<h1>PHPExcel ' . pathinfo($exampleType,PATHINFO_BASENAME) . ' Examples</h1>';
 
 	$exampleList = glob('./'.$exampleType.'/*.php');
 
@@ -36,7 +36,8 @@ foreach($exampleTypeList as $exampleType) {
 			$h2Text = (preg_match($h2Pattern, $fileData, $out)) ? $out[1] : '';
 
 			echo '<a href="',$exampleFile,'">',$h1Text,'</a><br />';
-			if ($h2Text > '') {
+			if (($h2Text > '') &&
+				(pathinfo($exampleType,PATHINFO_BASENAME) != 'Calculations')) {
 				echo $h2Text,'<br />';
 			}
 		}
diff --git a/Documentation/PHPExcel Function Reference developer documentation.doc b/Documentation/PHPExcel Function Reference developer documentation.doc
index e20f03cf..8be41483 100644
Binary files a/Documentation/PHPExcel Function Reference developer documentation.doc and b/Documentation/PHPExcel Function Reference developer documentation.doc differ
