Added file support and a basic test.
Merge branch 'master' into website