Merge pull request #3 from suntomoon/master

sync
Merge pull request #4 from liudongtony/master

Merge pull request #3 from suntomoon/master