[RANDOM-ID] - comments added
Merge pull request #4 from michalbe/master-temp

[RANDOM-ID] - comments added