Better use of display method in view controller.
Merge remote-tracking branch 'origin/master'