committed by Jingyang
Merge pull request #35 from xianyun9527/master

committed by Jingyang