4th commit / wk7
Merge pull request #4 from Ping0314/pingli

4th commit / wk7