Merge pull request #3 from Levifer/Sprint1

Sprint1