Merge pull request #7 from warheart6/Sprint1

Sprint1
Merge pull request #5 from Levifer/Sprint1

Sprint1