Alarma_Clase
Merge origin/master