Add solution to #13