Chen Aidao's assignment4
Merge pull request #240 from imcad/master

Chen Aidao's assignment4