Merge pull request #58 from liaojia/master

ee
Merge pull request #59 from liaojia/master

ee
STH
Merge remote-tracking branch 'origin'
STH
STH
Merge pull request #43 from suntinghui/master

df