Index: /trunk/Include/Classes/System/IO/DirectoryInfo.ab
===================================================================
--- /trunk/Include/Classes/System/IO/DirectoryInfo.ab	(revision 320)
+++ /trunk/Include/Classes/System/IO/DirectoryInfo.ab	(revision 321)
@@ -95,9 +95,17 @@
 		If searchOption = SearchOption.TopDirectoryOnly Then
 			Return GetDirectories(searchPattern)
-		Else
+		ElseIf searchOption = SearchOption.AllDirectories Then
 			Dim dirs As List<DirectoryInfo>
 			dirs = GetDirectories(searchPattern)
-			Dim i As Long
 
+			Dim subdirs As List<DirectoryInfo>
+			Dim i As Long, j As Long
+			For i = 0 To ELM(dirs.Count)
+				subdirs = dirs[i].GetDirectories(searchPattern)
+				For j = 0 To ELM(subdirs.Count)
+					dirs.Add(subdirs[i])
+				Next
+			Next
+			Return dirs
 		End If
 	End Function*/
@@ -153,4 +161,5 @@
 				lastError = GetLastError()
 				If lastError <> ERROR_NO_MORE_FILES Then
+					FindClose(find)
 					debug 'Exception
 					Return Nothing
@@ -159,4 +168,5 @@
 			i++
 		Wend
+		FindClose(find)
 		Return files
 	End Function