Updated last changes from master