Prace nad #4
Fixes #4