Sprint 41
Merge pull request #12 from Stono/master

Sprint 41