merging latest changes from main repository