Added solution to #12