fixed #defect1 and completed #story10