merge for #32