Fixed #5. Gathering files to improve performance
Merge pull request #6 from sideroad/new_proposal

Fixed #5. Gathering files to improve performance