Poprawka na issue 1
Merge branch 'issue1'