Merge pull request #3 from ZhuoranLyu/master

merge
Merge pull request #3 from fs1214/master

Merge pull request #3 from ZhuoranLyu/master