Sprint 23
Merge pull request #4 from pkoro/master

Sprint 23