Add solution for problem #15