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

[MICHAL] - v++