Added solution to #21