Improve file handling
Merge pull request #1 from ahomu/modern-format

Merged!