Merge pull request #510 from caioariede/caioariede/exclude-files-earlier

Performance improvement: Exclude files earlier