Merge pull request #2 from Levifer/Sprint1

Sprint1