Merge pull request #3 from Andrew-Hagedorn-ZocDoc/ImprovePerformance

Improve performance
Merge remote-tracking branch 'origin/master' into CollectFilesForDebugMode