add
Merge pull request #7 from xudafeng/master

Auto merge by kpm server