build
Merge pull request #17 from chishang/master

Auto merge by kpm server