task #5 ver3
Merge pull request #72 from Neodelf/fixes

task #5 ver3