Adding solution to #36