pull request from yongjiao master to vivian fork

Hi Yongjiao! 

I'd like to pull this project from your repo to my fork. 

Thanks!
Vivian