Dir/file list fixes
Merge pull request #815 from TheUnknownOne/master

Dir/file list fixes