still pixelated but far less sucky
Merge remote-tracking branch 'origin/master'