reading dir recursively
Merge branch 'atom' into atom-with-folder