worked on task #10 - for version 4.0.4