Wykonano issue #15, #19