[MICHAL] - v++
Merge pull request #16 from michalbe/master-temp

[MICHAL] - v++