recursive directory traversal fix #1
merge