Merge pull request #50 from maginatics/file

Use File for type-safety