task #5
task #5 ver2
Merge pull request #70 from Neodelf/fixes

task #5