Add solution for #272