Add solution to #5