Added solution for #22