Edd

merge edd->master