Update result display
Update from master and fix result download