Merge pull request #38 from Arthur26/sprint2

Sprint2
Merge pull request #15 from itcc-li/sprint2

Merge pull request #38 from Arthur26/sprint2