Merge pull request #1 from itcc-li/sprint2

Sprint2
Merge pull request #11 from thomasE1993/master

Update
Merge pull request #4 from itcc-li/sprint2

Sprint2
Merge pull request #5 from thomasE1993/master

Update
Merge pull request #5 from thomasE1993/sprint2

Merge pull request #5 from thomasE1993/master
renamed package
Merge pull request #6 from plon33r/sprint2

Sprint2