checkpoint 3 for gao0141
Merge pull request #78 from maicallist/master

checkpoint 3 for gao0141