Index: TECH/ClassUtils.cls.xml
===================================================================
diff -u -r2139 -r2183
--- TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 2139)
+++ TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 2183)
@@ -517,27 +517,31 @@
 
 <Method name="GetClassesInPackageIterator">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>Package:%String</FormalSpec>
+<FormalSpec>Package:%String,IncludeSubPackages:%Boolean=0</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
-	#dim ClassesInPackageIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(..GetClassesInPackage(Package))
+	#dim ClassesInPackageIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(..GetClassesInPackage(Package,IncludeSubPackages))
 	quit ClassesInPackageIterator
 ]]></Implementation>
 </Method>
 
 <Method name="GetClassesInPackage">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>Package:%String</FormalSpec>
+<FormalSpec>Package:%String,IncludeSubPackages:%Boolean=0</FormalSpec>
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
 	set Classes = ##class(%ListOfDataTypes).%New()
-	#dim Query As %String = "SELECT Name FROM %Dictionary.ClassDefinition WHERE Name %STARTSWITH ? ORDER BY Name"
+	#dim Query As TECH.String = "SELECT Name FROM %Dictionary.ClassDefinition WHERE Name %STARTSWITH ? ORDER BY Name"
 	
 	#dim ResultSet As TECH.ResultSet = ##class(TECH.ResultSet).Create(Query,$listbuild(Package))
 	while ResultSet.Next() {
-		#dim ClassName As %String = ResultSet.GetData(1)
-		#dim Adder As %Boolean = $$$Not(##class(TECH.StringUtils).EndsWith(Package,"."))
-		if $length(ClassName,".")=($length(Package,".")+Adder) do Classes.Insert(ClassName)
+		#dim ClassName As TECH.String = ResultSet.GetData(1)
+		if $$$Not(IncludeSubPackages) {
+			#dim Adder As %Boolean = $$$Not(##class(TECH.StringUtils).EndsWith(Package,"."))
+			if $length(ClassName,".")=($length(Package,".")+Adder) do Classes.Insert(ClassName)
+		} else {
+			do Classes.Insert(ClassName)
+		}
 	}
 	quit Classes
 ]]></Implementation>