updated by kevin

study
Merge pull request #1 from kjpmei/master

updated by kevin