Merge pull request #67 from pengqin/dev

Dev
k
Merge pull request #79 from hopesfish/dev

dev