Minor updates

You have some great code here!  Congratulations.  Your approach to the `files_and_folders()` problem is elegant.
Merge pull request #1 from cclauss/patch-1

Minor updates