Made timelimit kwarg None by default
Corrected unwind logic