Added a shorter sollution to the same file.
Working solution for No.20
Added a shorter version.
Merge branch 'feature/ID0020' into develop