Fork of Mass download version 1.5.2 with improvements