task #5 ver4
Merge pull request #73 from Neodelf/fixes

Fixes