Add solution for #2