redux of the files-test branch
Merge pull request #79 from dart-gde/files2

redux of the files-test branch