tmp2
Merge pull request #43 from michalikm/dev

tmp2