replaced "for .. in" with find, for better path-with-whitespace support
Merge branch 'release/1.0.6'