Solution for Task #16 added