merge from madbearz

merge from madbearz