merge buttmen changes into master