2nd commit / Wk7
3rd commit / wk7
Merge pull request #3 from Ping0314/pingli

2nd commit / Wk7