Support multiple elements per file.
Merge pull request #20