STH
Merge pull request #17 from liaojia/master

jia
Merge pull request #12 from suntinghui/master

jia