merge from stevecb2 branch