First send. Mental note: should make smaller commits
Merge pull request #1 from joaozeni/display_file

First send. Mental note: should make smaller commits