Add solution for problem #2