add support for --files
Merge branch 'files'

* files:
  add support for --files