starting merge with surdu_petru repo