Merge pull request #24 from suntinghui/master

aas
Merge pull request #35 from liaojia/master

pull