Merge pull request #46 from suntinghui/master

w
Merge pull request #63 from liaojia/master

ee