diff --git a/components/fpspreadsheet/examples/other/cell_formats/demo_write_formatting.lpi b/components/fpspreadsheet/examples/other/cell_formats/demo_write_formatting.lpi
index 76a48d47b..dd23ead11 100644
--- a/components/fpspreadsheet/examples/other/cell_formats/demo_write_formatting.lpi
+++ b/components/fpspreadsheet/examples/other/cell_formats/demo_write_formatting.lpi
@@ -25,9 +25,16 @@
       <Version Value="2"/>
     </PublishOptions>
     <RunParams>
+      <local>
+        <CommandLineParams Value="-quit"/>
+      </local>
       <FormatVersion Value="2"/>
       <Modes Count="1">
-        <Mode0 Name="default"/>
+        <Mode0 Name="default">
+          <local>
+            <CommandLineParams Value="-quit"/>
+          </local>
+        </Mode0>
       </Modes>
     </RunParams>
     <RequiredPackages Count="1">
diff --git a/components/fpspreadsheet/examples/other/cell_formats/demo_write_formatting.pas b/components/fpspreadsheet/examples/other/cell_formats/demo_write_formatting.pas
index 3fe4b0a77..5eb1947ac 100644
--- a/components/fpspreadsheet/examples/other/cell_formats/demo_write_formatting.pas
+++ b/components/fpspreadsheet/examples/other/cell_formats/demo_write_formatting.pas
@@ -159,6 +159,13 @@ begin
   MyWorkbook.Free;
 
   WriteLn('Finished. Please open "'+TestFileXLS+'" and "' + TestFileODS + '" in your spreadsheet program.');
-  ReadLn;
+
+  if ParamCount = 0 then
+  begin
+    {$IFDEF MSWINDOWS}
+    WriteLn('Press [ENTER] to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/other/colors/demo_write_colors.lpr b/components/fpspreadsheet/examples/other/colors/demo_write_colors.lpr
index f00cb5bf9..851a1f7a4 100644
--- a/components/fpspreadsheet/examples/other/colors/demo_write_colors.lpr
+++ b/components/fpspreadsheet/examples/other/colors/demo_write_colors.lpr
@@ -60,6 +60,13 @@ begin
 
   writeln('Finished.');
   WriteLn('Please open "'+Testfile+'" in your spreadsheet program.');
-  ReadLn;
+
+  if ParamCount = 0 then
+  begin
+    {$IFDEF MSWINDOWS}
+    WriteLn('Press [ENTER] to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/other/conditional_formatting/demo_conditional_formatting.pas b/components/fpspreadsheet/examples/other/conditional_formatting/demo_conditional_formatting.pas
index f222962e2..04d903802 100644
--- a/components/fpspreadsheet/examples/other/conditional_formatting/demo_conditional_formatting.pas
+++ b/components/fpspreadsheet/examples/other/conditional_formatting/demo_conditional_formatting.pas
@@ -401,14 +401,19 @@ begin
     wb.WriteToFile('test.ods', true);
     wb.WriteToFile('test.xml', true);
 
-    if wb.ErrorMsg <> '' then begin
+    if wb.ErrorMsg <> '' then
       WriteLn(wb.ErrorMsg);
-      WriteLn;
-      WriteLn('Press ENTER to close.');
-      ReadLn;
-    end;
+
   finally
     wb.Free;
   end;
+
+  if ParamCount = 0 then
+  begin
+    {$IFDEF MSWINDOWS}
+    WriteLn('Press [ENTER] to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/other/expression_parser/demo_expression_parser.pas b/components/fpspreadsheet/examples/other/expression_parser/demo_expression_parser.pas
index e558aa87c..2eef16c28 100644
--- a/components/fpspreadsheet/examples/other/expression_parser/demo_expression_parser.pas
+++ b/components/fpspreadsheet/examples/other/expression_parser/demo_expression_parser.pas
@@ -113,8 +113,13 @@ begin
     workbook.Free;
   end;
 
-  WriteLn('Press ENTER to quit...');
-  ReadLn;
+  if ParamCount = 0 then
+  begin
+    {$IFDEF MSWINDOWS}
+    WriteLn('Press [ENTER] to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 
 end.
 
diff --git a/components/fpspreadsheet/examples/other/header_footer_images/demo_write_headerfooter_images.lpr b/components/fpspreadsheet/examples/other/header_footer_images/demo_write_headerfooter_images.lpr
index dd343d84d..74e680c78 100644
--- a/components/fpspreadsheet/examples/other/header_footer_images/demo_write_headerfooter_images.lpr
+++ b/components/fpspreadsheet/examples/other/header_footer_images/demo_write_headerfooter_images.lpr
@@ -14,9 +14,9 @@ var
   i, r, c: Integer;
 
 const
-  image1 = '../../images/components/TSWORKBOOKSOURCE.png';
-  image2 = '../../images/components/TSWORKSHEETGRID.png';
-  image3 = '../../images/components/TSCELLEDIT.png';
+  image1 = '../../../images/components/TSWORKBOOKSOURCE.png';
+  image2 = '../../../images/components/TSWORKSHEETGRID.png';
+  image3 = '../../../images/components/TSCELLEDIT.png';
 
 begin
   Writeln('Starting program "demo_write_headerfooter_images"...');
@@ -49,10 +49,14 @@ begin
 
     WriteLn('Finished.');
     WriteLn('Please open the files "hfimg.*" in your spreadsheet program.');
-   {$ifdef WINDOWS}
-    WriteLn('Press ENTER to close this program...');
-    ReadLn;
-   {$endif}
+
+    if ParamCount = 0 then
+    begin
+      {$IFDEF MSWINDOWS}
+      WriteLn('Press [ENTER] to close this program...');
+      ReadLn;
+      {$ENDIF}
+    end;
 
   finally
     MyWorkbook.Free;
diff --git a/components/fpspreadsheet/examples/other/images/demo_write_images.lpr b/components/fpspreadsheet/examples/other/images/demo_write_images.lpr
index 753820ac3..2b00819a6 100644
--- a/components/fpspreadsheet/examples/other/images/demo_write_images.lpr
+++ b/components/fpspreadsheet/examples/other/images/demo_write_images.lpr
@@ -51,13 +51,17 @@ begin
 
     WriteLn('Finished.');
     WriteLn('Please open the files "img.*" in your spreadsheet program.');
-   {$ifdef WINDOWS}
-    WriteLn('Press ENTER to close this program...');
-    ReadLn;
-   {$ENDIF}
 
   finally
     MyWorkbook.Free;
   end;
+
+  if ParamCount = 0 then
+  begin
+    {$IFDEF MSWINDOWS}
+    WriteLn('Press [ENTER] to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/other/metadata/demo_metadata.lpr b/components/fpspreadsheet/examples/other/metadata/demo_metadata.lpr
index 930552b06..0c66ef1fe 100644
--- a/components/fpspreadsheet/examples/other/metadata/demo_metadata.lpr
+++ b/components/fpspreadsheet/examples/other/metadata/demo_metadata.lpr
@@ -109,6 +109,12 @@ begin
     book.Free;
   end;
 
-  ReadLn;
+  if ParamCount = 0 then
+  begin
+    {$IFDEF MSWINDOWS}
+    WriteLn('Press [ENTER] to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/other/protection/demo_protection.pas b/components/fpspreadsheet/examples/other/protection/demo_protection.pas
index 8cb2a55cd..de109efa2 100644
--- a/components/fpspreadsheet/examples/other/protection/demo_protection.pas
+++ b/components/fpspreadsheet/examples/other/protection/demo_protection.pas
@@ -46,8 +46,14 @@ begin
 
   WriteLn('Open the files "protected.*" in your spreadsheet application.');
   WriteLn('Only cell A1 can be modifed.');
-  WriteLn('Press [ENTER] to quit...');
-  ReadLn;
+
+  if ParamCount = 0 then
+  begin
+    {$IFDEF MSWINDOWS}
+    WriteLn('Press [ENTER] to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 
 end.
 
diff --git a/components/fpspreadsheet/examples/other/recursive_calculation/demo_recursive_calc.pas b/components/fpspreadsheet/examples/other/recursive_calculation/demo_recursive_calc.pas
index 3705d5fef..7952c676b 100644
--- a/components/fpspreadsheet/examples/other/recursive_calculation/demo_recursive_calc.pas
+++ b/components/fpspreadsheet/examples/other/recursive_calculation/demo_recursive_calc.pas
@@ -45,9 +45,16 @@ begin
     writeln('Please open "'+OutputFile+'" in "fpsgrid".');
     writeLn('It must show correct calculation results in cells B1 and B2.');
 
-    ReadLn;
   finally
     workbook.Free;
   end;
+
+  if ParamCount = 0 then
+  begin
+    {$IFDEF MSWINDOWS}
+    WriteLn('Press [ENTER] to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/other/rpn_formulas/demo_write_formula.pas b/components/fpspreadsheet/examples/other/rpn_formulas/demo_write_formula.pas
index 81be4abaf..0a1c76e32 100644
--- a/components/fpspreadsheet/examples/other/rpn_formulas/demo_write_formula.pas
+++ b/components/fpspreadsheet/examples/other/rpn_formulas/demo_write_formula.pas
@@ -101,10 +101,14 @@ begin
     MyWorkbook.Free;
   end;
 
-  writeln('Finished. Please open "'+Testfile+'" in your spreadsheet program.');
-  {$IFDEF MSWINDOWS}
-  WriteLn('Press [ENTER] to quit.');
-  ReadLn;
-  {$ENDIF}
+  WriteLn('Finished. Please open "'+Testfile+'" in your spreadsheet program.');
+
+  if ParamCount = 0 then
+  begin
+    {$IFDEF MSWINDOWS}
+    WriteLn('Press [ENTER] to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/other/run_all_demos.bat b/components/fpspreadsheet/examples/other/run_all_demos.bat
new file mode 100644
index 000000000..e9c7adaed
--- /dev/null
+++ b/components/fpspreadsheet/examples/other/run_all_demos.bat
@@ -0,0 +1,16 @@
+cell_formats\demo_write_formatting -quit
+colors\demo_write_colors -quit
+conditional_formatting\demo_conditional_formatting -quit
+expression_parser\demo_expression_parser -quit
+header_footer_images\demo_write_headerfooter_images -quit
+ignore_formulas\demo_ignore_formula -quit
+images\demo_write_images -quit
+metadata\demo_metadata -quit
+protection\demo_protection -quit
+recursive_calculation\demo_recursive_calc -quit
+rpn_formulas\demo_write_formula -quit
+searching\demo_search -quit
+sorting\demo_sorting -quit
+user_defined_formulas\demo_formula_func -quit
+virtual_mode\demo_virtualmode_write -quit
+virtual_mode\demo_virtualmode_read -quit
diff --git a/components/fpspreadsheet/examples/other/searching/demo_search.pas b/components/fpspreadsheet/examples/other/searching/demo_search.pas
index 030fcc357..8e358e2cb 100644
--- a/components/fpspreadsheet/examples/other/searching/demo_search.pas
+++ b/components/fpspreadsheet/examples/other/searching/demo_search.pas
@@ -64,10 +64,13 @@ begin
     workbook.Free;
   end;
 
-  {$IFDEF MSWINDOWS}
-  WriteLn;
-  WriteLn('Press ENTER to quit...');
-  ReadLn;
-  {$ENDIF}
+  if ParamCount = 0 then
+  begin
+    {$IFDEF MSWINDOWS}
+    WriteLn;
+    WriteLn('Press [ENTER] to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/other/sorting/demo_sorting.pas b/components/fpspreadsheet/examples/other/sorting/demo_sorting.pas
index 428b95758..d66e55081 100644
--- a/components/fpspreadsheet/examples/other/sorting/demo_sorting.pas
+++ b/components/fpspreadsheet/examples/other/sorting/demo_sorting.pas
@@ -412,7 +412,12 @@ begin
   SortTwoColumns_TwoKeys_1;
   SortTwoRows_TwoKeys_1;
 
-  WriteLn('Press ENTER to quit...');
-  ReadLn;
+  if ParamCount = 0 then
+  begin
+    {$IFDEF MSWINDOWS}
+    WriteLn('Press [ENTER] to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/other/user_defined_formulas/demo_formula_func.pas b/components/fpspreadsheet/examples/other/user_defined_formulas/demo_formula_func.pas
index 27b5efeb4..44cbb5998 100644
--- a/components/fpspreadsheet/examples/other/user_defined_formulas/demo_formula_func.pas
+++ b/components/fpspreadsheet/examples/other/user_defined_formulas/demo_formula_func.pas
@@ -305,8 +305,14 @@ begin
 
   WriteLn;
   WriteLn('Open the file in Excel or OpenOffice/LibreOffice.');
-  WriteLn('Press [ENTER] to close...');
-  ReadLn;
+
+  if ParamCount = 0 then
+  begin
+    {$IFDEF MSWINDOWS}
+    WriteLn('Press [ENTER] to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.
 
 
diff --git a/components/fpspreadsheet/examples/other/virtual_mode/demo_virtualmode_read.lpr b/components/fpspreadsheet/examples/other/virtual_mode/demo_virtualmode_read.lpr
index 0a14dff38..d46d42618 100644
--- a/components/fpspreadsheet/examples/other/virtual_mode/demo_virtualmode_read.lpr
+++ b/components/fpspreadsheet/examples/other/virtual_mode/demo_virtualmode_read.lpr
@@ -86,7 +86,12 @@ begin
     dataAnalyzer.Free;
   end;
 
-  WriteLn('Press [ENTER] to quit...');
-  ReadLn;
+  if ParamCount = 0 then
+  begin
+    {$IFDEF MSWINDOWS}
+    WriteLn('Press [ENTER] to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/other/virtual_mode/demo_virtualmode_write.lpr b/components/fpspreadsheet/examples/other/virtual_mode/demo_virtualmode_write.lpr
index f28142798..34711497a 100644
--- a/components/fpspreadsheet/examples/other/virtual_mode/demo_virtualmode_write.lpr
+++ b/components/fpspreadsheet/examples/other/virtual_mode/demo_virtualmode_write.lpr
@@ -114,7 +114,13 @@ begin
   end;
 
   WriteLn(Format('Execution time: %.3f sec', [t*24*60*60]));
-  WriteLn('Press [ENTER] to quit...');
-  ReadLn;
+
+  if ParamCount = 0 then
+  begin
+    {$IFDEF MSWINDOWS}
+    WriteLn('Press [ENTER] to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpr b/components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpr
index 3fbacf6e4..5a76196c7 100644
--- a/components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpr
+++ b/components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpr
@@ -64,9 +64,12 @@ begin
   end;
 
   {$ifdef WINDOWS}
-  WriteLn;
-  WriteLn('Press ENTER to quit...');
-  ReadLn;
+  if ParamCount = 0 then
+  begin
+    WriteLn;
+    WriteLn('Press ENTER to quit...');
+    ReadLn;
+  end;
   {$ENDIF}
 end.
 
diff --git a/components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpr b/components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpr
index 893565a0e..87321b420 100644
--- a/components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpr
+++ b/components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpr
@@ -59,10 +59,13 @@ begin
     MyWorkbook.Free;
   end;
 
-  {$ifdef Windows}
-  WriteLn;
-  WriteLn('Press ENTER to quit...');
-  ReadLn;
-  {$endif}
+  if ParamCount = 0 then
+  begin
+    {$ifdef Windows}
+    WriteLn;
+    WriteLn('Press ENTER to quit...');
+    ReadLn;
+    {$endif}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpr b/components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpr
index 173c5402c..05cdcfcbf 100644
--- a/components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpr
+++ b/components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpr
@@ -57,10 +57,13 @@ begin
     MyWorkbook.Free;
   end;
 
-  {$ifdef Windows}
-  WriteLn;
-  WriteLn('Press ENTER to quit...');
-  Readln;
-  {$endif}
+  if ParamCount = 0 then
+  begin
+    {$ifdef Windows}
+    WriteLn;
+    WriteLn('Press ENTER to quit...');
+    Readln;
+    {$endif}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpr b/components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpr
index afc537f31..950631a89 100644
--- a/components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpr
+++ b/components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpr
@@ -64,10 +64,13 @@ begin
     MyWorkbook.Free;
   end;
 
-  {$IFDEF WINDOWS}
-  WriteLn;
-  WriteLn('Press ENTER to quit...');
-  ReadLn;
-  {$ENDIF}
+  if ParamCount = 0 then
+  begin
+    {$IFDEF WINDOWS}
+    WriteLn;
+    WriteLn('Press ENTER to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlread.lpr b/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlread.lpr
index ca33607a7..3d17b4df6 100644
--- a/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlread.lpr
+++ b/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlread.lpr
@@ -97,10 +97,13 @@ begin
     workbook.Free;
   end;
 
-  {$IFDEF WINDOWS}
-  WriteLn;
-  WriteLn('Press ENTER to quit...');
-  ReadLn;
-  {$ENDIF}
+  if ParamCount = 0 then
+  begin
+    {$IFDEF WINDOWS}
+    WriteLn;
+    WriteLn('Press ENTER to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlwrite.lpr b/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlwrite.lpr
index 43a397564..c5df8ee34 100644
--- a/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlwrite.lpr
+++ b/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlwrite.lpr
@@ -398,10 +398,14 @@ begin
 
   WriteLn('Done.');
   WriteLn('File saved as "' + MyDir + 'text.xml"');
-  {$IFDEF WINDOWS}
-  WriteLn;
-  WriteLn('Press ENTER to quit.');
-  ReadLn;
-  {$ENDIF}
+
+  if ParamCount = 0 then
+  begin
+    {$IFDEF WINDOWS}
+    WriteLn;
+    WriteLn('Press ENTER to quit.');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/read_write/htmldemo/htmlread.lpr b/components/fpspreadsheet/examples/read_write/htmldemo/htmlread.lpr
index cf5584808..3479d796d 100644
--- a/components/fpspreadsheet/examples/read_write/htmldemo/htmlread.lpr
+++ b/components/fpspreadsheet/examples/read_write/htmldemo/htmlread.lpr
@@ -61,10 +61,13 @@ begin
     MyWorkbook.Free;
   end;
 
- {$IFDEF WINDOWS}
-  WriteLn;
-  WriteLn('Press ENTER to quit...');
-  ReadLn;
- {$ENDIF}
+  if ParamCount = 0 then
+  begin
+   {$IFDEF WINDOWS}
+    WriteLn;
+    WriteLn('Press ENTER to quit...');
+    ReadLn;
+   {$ENDIF}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpr b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpr
index 50d0beb62..b1baef25a 100644
--- a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpr
+++ b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpr
@@ -55,10 +55,13 @@ begin
   // Finalization
   MyWorkbook.Free;
 
-  {$ifdef WINDOWS}
-  WriteLn;
-  WriteLn('Press ENTER to quit...');
-  ReadLn;
-  {$ENDIF}
+  if ParamCount = 0 then
+  begin
+    {$ifdef WINDOWS}
+    WriteLn;
+    WriteLn('Press ENTER to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr
index e44c699e5..549bb8946 100644
--- a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr
+++ b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr
@@ -37,9 +37,12 @@ begin
 
   WriteLn('Workbook written to "' + Mydir + 'test.xlsx' + '".');
 
-  {$IFDEF MSWINDOWS}
-  WriteLn('Press ENTER to quit...');
-  ReadLn;
-  {$ENDIF}
+  if ParamCount = 0 then
+  begin
+    {$IFDEF MSWINDOWS}
+    WriteLn('Press ENTER to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.pas b/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.pas
index 4052e411c..4e12df5df 100644
--- a/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.pas
+++ b/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.pas
@@ -73,10 +73,13 @@ begin
   // Finalization
   MyWorkbook.Free;
 
-  {$ifdef WINDOWS}
-  WriteLn;
-  WriteLn('Press ENTER to quit...');
-  ReadLn;
-  {$ENDIF}
+  if ParamCount = 0 then
+  begin
+    {$ifdef WINDOWS}
+    WriteLn;
+    WriteLn('Press ENTER to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/read_write/opendocdemo/opendocread.lpr b/components/fpspreadsheet/examples/read_write/opendocdemo/opendocread.lpr
index 5e5f4dda1..bb916bdde 100644
--- a/components/fpspreadsheet/examples/read_write/opendocdemo/opendocread.lpr
+++ b/components/fpspreadsheet/examples/read_write/opendocdemo/opendocread.lpr
@@ -55,10 +55,13 @@ begin
   // Finalization
   MyWorkbook.Free;
 
-  {$IFDEF WINDOWS}
-  WriteLn;
-  Writeln('Press ENTER to quit...');
-  ReadLn;
-  {$ENDIF}
+  if ParamCount = 0 then
+  begin
+    {$IFDEF WINDOWS}
+    WriteLn;
+    Writeln('Press ENTER to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.
 
diff --git a/components/fpspreadsheet/examples/read_write/run_all_demos.bat b/components/fpspreadsheet/examples/read_write/run_all_demos.bat
new file mode 100644
index 000000000..411e72888
--- /dev/null
+++ b/components/fpspreadsheet/examples/read_write/run_all_demos.bat
@@ -0,0 +1,25 @@
+csvdemo\csvwrite -quit
+csvdemo\csvread -quit
+
+excel2demo\excel2write -quit
+excel2demo\excel2read -quit
+
+excel5demo\excel5write -quit
+excel5demo\excel5read -quit
+
+excel8demo\excel8write -quit
+excel8demo\excel8read -quit
+
+excelxmldemo\excelxmlwrite -quit
+excelxmldemo\excelxmlread -quit
+
+htmldemo\htmlwrite -quit
+htmldemo\htmlread -quit
+
+ooxmldemo\ooxmlwrite -quit
+ooxmldemo\ooxmlread -quit
+
+opendocdemo\opendocwrite -quit
+opendocdemo\opendocread -quit
+
+wikitabledemo\wikitablewrite -quit
diff --git a/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpr b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpr
index 1935c76e7..734f292cc 100644
--- a/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpr
+++ b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpr
@@ -61,10 +61,13 @@ begin
   // Finalization
   MyWorkbook.Free;
 
-  {$IFDEF WINDOWS}
-  WriteLn;
-  WriteLn('Press ENTER to quit...');
-  ReadLn;
-  {$ENDIF}
+  if ParamCount = 0 then
+  begin
+    {$IFDEF WINDOWS}
+    WriteLn;
+    WriteLn('Press ENTER to quit...');
+    ReadLn;
+    {$ENDIF}
+  end;
 end.