task #5 ver5
Merge pull request #74 from Neodelf/fixes

task #5 ver5