Add solution for #7