Adding Adrián Arroyo (Closes #243)