Branch test.
Branch test.
Merge branch 'Giuliano'
Minor changes.
Minor changes on how we display information in the terminal.
Merge branch 'master' into Giuliano
Merge branch 'Giuliano'