Modificando autor
Merge composer/master