merge from sidschingis/patch