Added solution for #7