Added solution to #1