Add solution to #27