Merge pull request #536 from cmu-delphi/ds/file

Merge pull request #536 from cmu-delphi/ds/file #343