Code review
Merge pull request #1 from wojtek-szymanski/master

Code review