Merge pull request #59 from hopesfish/dev

Dev
Merge pull request #60 from hopesfish/dev

Dev
Merge pull request #49 from pengqin/dev

Dev