zm
Merge pull request #26 from michalikm/dev

zm