HW4: Syncing with master.
HW4: Correcting merge bugs.