Merge pull request #1 from wwwfuzheng/master

Auto merge by kpm server