Fix loop condition and early return conversion (find/map)
Merge pull request #62 from dnadolny/fix-loop

Fix loop condition and early return conversion (find/map)