STH
Merge pull request #22 from liaojia/master

jk
STH
Merge pull request #16 from suntinghui/master

Ljj