Merged Chao's commit
Merge pull request #17 from franklixuefei/master

Merged Chao's commit