Adding the graphical part
Merge remote-tracking branch 'origin/master'