looks better on Firefox now
Merge remote-tracking branch 'upstream/master'