yihan part
Merge pull request #1 from jianxiapyh/master

yihan part