Added solution for #132