add
Merge pull request #63 from xudafeng/master

Auto merge by kpm server