Merge pull request #30 from liaojia/master

jia
STH
Merge remote-tracking branch 'origin'
Merge pull request #23 from suntinghui/master

jiak