Pulling in download script improvements from Christian Groschupp