Display filename too
Merge pull request #2 from Joan/master

Display filename too