Added solution to #20