Merge pull request #2 from zhoulinjun1994/master

Merge