Added solution to #16.