Added solution for #131