恢复1.1
Merge pull request #28 from luics/master

Auto merge by kpm server