Merge pull request #480 from Maaack/update-file-lister