Added solution for #32
Added #33