vasko be
vasko merge
fixed conflict
pesho