Add solution for #38