Fixed handline of non-recursive case.
Initial check-in of this file.