Fixes
Merge pull request #20 from piotrglazar/feature/fixes

Fixes