Merge pull request #1 from weiviolin/master

edit
modified
Merge pull request #1 from KJSui/master

midify