Merge pull request #1 from xia-knight/master

 Please enter the commit message for your changes. Lines starting