Merge pull request #6 from warheart6/Sprint1

Merge pull request #3 from Levifer/Sprint1
Merge pull request #4 from Levifer/Sprint1

Sprint1