Look for current folder first. Fix #36.

Look for current folder first. Fix #36.
Maybe altering the loop, make it something some do...while instead of while is better