Index: TECH/File/impl/FileUtils.cls.xml
===================================================================
diff -u -r2616 -r3385
--- TECH/File/impl/FileUtils.cls.xml	(.../FileUtils.cls.xml)	(revision 2616)
+++ TECH/File/impl/FileUtils.cls.xml	(.../FileUtils.cls.xml)	(revision 3385)
@@ -13,9 +13,9 @@
 </Method>
 
 <Method name="GetFileList">
-<FormalSpec>Directory:%String,FileMask:%String="*.*",AddSubDir:%Boolean=1,IncludeDirs:%Boolean=0</FormalSpec>
+<FormalSpec>Directory:%String,FileMask:%String="*.*",AddSubDir:%Boolean=1,IncludeDirs:%Boolean=0,NumberOfFiles:%Numeric=0</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.Files).%New().GetFileList(Directory, FileMask, AddSubDir, IncludeDirs)
+<Implementation><![CDATA[	Quit ##class(TECH.Files).%New().GetFileList(Directory, FileMask, AddSubDir, IncludeDirs,NumberOfFiles)
 ]]></Implementation>
 </Method>
 
Index: TECH/Files.cls.xml
===================================================================
diff -u -r2967 -r3385
--- TECH/Files.cls.xml	(.../Files.cls.xml)	(revision 2967)
+++ TECH/Files.cls.xml	(.../Files.cls.xml)	(revision 3385)
@@ -61,12 +61,13 @@
 </Method>
 
 <Method name="GetFileList">
-<FormalSpec>Directory:%String,FileMask:%String="*.*",AddSubDir:%Boolean=1,IncludeDirs:%Boolean=0</FormalSpec>
+<FormalSpec>Directory:%String,FileMask:%String="*.*",AddSubDir:%Boolean=1,IncludeDirs:%Boolean=0,NumberOfFiles:%Numeric=0</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
 	set rset = ##class(%ResultSet).%New("%File:FileSet")
 	do rset.Execute(Directory,FileMask,"",1)
-	while (rset.Next()) { 
+	#dim ContinueLoop as %Boolean = $$$True
+	while (rset.Next() & ContinueLoop) { 
           Set FullName = ..AppendFile(Directory,rset.Data("ItemName"))
           if (rset.Data("Type") = "D") { 
           	set SubDirectory = FullName
@@ -75,6 +76,7 @@
           }
           else {
 	        Do ..AddToList(FullName,rset)   
+	        Set:NumberOfFiles ContinueLoop = (..List.Count() < NumberOfFiles)
           }
 	}
 	quit ..List
Index: TECH/File/FileUtils.cls.xml
===================================================================
diff -u -r2529 -r3385
--- TECH/File/FileUtils.cls.xml	(.../FileUtils.cls.xml)	(revision 2529)
+++ TECH/File/FileUtils.cls.xml	(.../FileUtils.cls.xml)	(revision 3385)
@@ -11,7 +11,7 @@
 </Method>
 
 <Method name="GetFileList">
-<FormalSpec>Directory:%String,FileMask:%String="*.*",AddSubDir:%Boolean=1,IncludeDirs:%Boolean=0</FormalSpec>
+<FormalSpec>Directory:%String,FileMask:%String="*.*",AddSubDir:%Boolean=1,IncludeDirs:%Boolean=0,NumberOfFiles:%Numeric=0</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 </Method>
 
Index: TECH/File/FileAPI.cls.xml
===================================================================
diff -u -r3307 -r3385
--- TECH/File/FileAPI.cls.xml	(.../FileAPI.cls.xml)	(revision 3307)
+++ TECH/File/FileAPI.cls.xml	(.../FileAPI.cls.xml)	(revision 3385)
@@ -6,7 +6,7 @@
 
 <Method name="GetFileList">
 <Abstract>1</Abstract>
-<FormalSpec>Directory:%String,FileMask:%String="*.*",AddSubDir:%Boolean=1,IncludeDirs:%Boolean=0</FormalSpec>
+<FormalSpec>Directory:%String,FileMask:%String="*.*",AddSubDir:%Boolean=1,IncludeDirs:%Boolean=0,NumberOfFiles:%Numeric=0</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
 </Method>
 
Index: TECH/File/impl/FileAPI.cls.xml
===================================================================
diff -u -r3307 -r3385
--- TECH/File/impl/FileAPI.cls.xml	(.../FileAPI.cls.xml)	(revision 3307)
+++ TECH/File/impl/FileAPI.cls.xml	(.../FileAPI.cls.xml)	(revision 3385)
@@ -4,10 +4,10 @@
 <Super>TECH.RegisteredObject,TECH.File.FileAPI</Super>
 
 <Method name="GetFileList">
-<FormalSpec>Directory:%String,FileMask:%String="*.*",AddSubDir:%Boolean=1,IncludeDirs:%Boolean=0</FormalSpec>
+<FormalSpec>Directory:%String,FileMask:%String="*.*",AddSubDir:%Boolean=1,IncludeDirs:%Boolean=0,NumberOfFiles:%Numeric=0</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
-	set FileIterator = ##class(TECH.ListIterator).%New(##class(TECH.File.impl.FileUtils).%New().GetFileList(Directory,FileMask,AddSubDir,IncludeDirs))
+	set FileIterator = ##class(TECH.ListIterator).%New(##class(TECH.File.impl.FileUtils).%New().GetFileList(Directory,FileMask,AddSubDir,IncludeDirs,NumberOfFiles))
 	quit ##class(TECH.DynamicIterator).%New(FileIterator,"Item.Name")
 ]]></Implementation>
 </Method>