Poprawki
Fixes #1
Merge branch 'feature/i1' into develop