last changes for 1.5.0