merge set_enumerize & master