Bug2fix
Added filename
Merge branch 'file-line' of https://github.com/nyrl/trash into file-line