Fixes #4434: support for large number of users
Merge pull request #284 from ncharles/bug_4434/dev/add_support_for_lot_of_files

Fixes #4434: support for large number of users