Can see some more pretty pictures now
Merge remote-tracking branch 'origin/master'