Merge pull request #281 from danvk/small-files-closure