Add solution to #19