merge last changes from official repository