Merge pull request #6 from plon33r/sprint2

Sprint2
Update
Update
Merge pull request #6 from thomasE1993/master

pull