Add solution for #9