Changes for hw7
Merge pull request #7 from zhopping/hw7

Changes for hw7