kingone pull request
Merge pull request #102 from kingoneYan/master

kingone pull request