Merge pull request #1 from HilaryLee/master

fixed
Merge pull request #2 from HilaryLee/master

fixed xxx
fixed link