Add solution to #7