Adding solution to #14