Merging, to obtain updated HW2 from Sheng-Liang