2_5 solution polished according with mentor's comment
Merge pull request #302 from ikolupaev/w2

2_5 solution polished according with mentor's comment