Merge pull request #26 from liaojia/master

键盘“完成”
STH
Merge remote-tracking branch 'origin'
Merge pull request #20 from suntinghui/master

jia