Add solution to #22