Merge of last changes