commit by 13307130309
Merge pull request #405 from Hermes777/assignment8.5

13307130309_tangyiqi_assignment8.5