version 4.0.5 - worked on task #12