Merge pull request #29 from liaojia/master

LJJ
Merge pull request #30 from liaojia/master

toast
Merge pull request #20 from suntinghui/master

yu