Merge pull request #120 from hopesfish/dev

update
Merge pull request #129 from hopesfish/pengqin-dev

Pengqin dev