ashao: HW9 commit
Merge pull request #159 from ashao/HW9_branch

ashao: HW9 commit