Merge alvarado a Master