Merge pull request #67 from chirowong/master

重新提一下
Merge pull request #16 from qatang/dev

1219