diff --git a/src/Examples/Text.php b/samples/Sample_01_SimpleText.php
similarity index 53%
rename from src/Examples/Text.php
rename to samples/Sample_01_SimpleText.php
index 1db1881e..e0448735 100644
--- a/src/Examples/Text.php
+++ b/samples/Sample_01_SimpleText.php
@@ -1,7 +1,18 @@
 <?php
-require_once '../PHPWord.php';
+
+error_reporting(E_ALL);
+
+if(php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR'])) {
+	define('EOL', PHP_EOL);
+}
+else {
+	define('EOL', '<br />');
+}
+
+require_once '../src/PHPWord.php';
 
 // New Word Document
+echo date('H:i:s') , " Create new PHPWord object" , EOL;
 $PHPWord = new PHPWord();
 
 // New portrait section
@@ -20,9 +31,18 @@ $section->addText('I am styled by two style definitions.', 'rStyle', 'pStyle');
 $section->addText('I have only a paragraph style definition.', null, 'pStyle');
 
 // Save File
+echo date('H:i:s') , " Write to Word2007 format" , EOL;
 $objWriter = PHPWord_IOFactory::createWriter($PHPWord, 'Word2007');
-$objWriter->save('Text.docx');
+$objWriter->save(str_replace('.php', '.docx', __FILE__));
 
+echo date('H:i:s') , " Write to OpenDocumentText format" , EOL;
 $objWriter = PHPWord_IOFactory::createWriter($PHPWord, 'ODText');
-$objWriter->save('Text.odt');
+$objWriter->save(str_replace('.php', '.odt', __FILE__));
+
+
+// Echo memory peak usage
+echo date('H:i:s') , " Peak memory usage: " , (memory_get_peak_usage(true) / 1024 / 1024) , " MB" , EOL;
+
+// Echo done
+echo date('H:i:s') , " Done writing file" , EOL;
 ?>
\ No newline at end of file