Remove the "files" prefix conditionally
Merge pull request #54 from pdpiech/master

Remove the "files" prefix conditionally