Merge pull request #3 from ZhuoranLyu/master

merge